Commit 1cf1b600 authored by spf's avatar spf
Browse files

Merge branch 'master' into 'master'

framadate minimum PHP version 5.4 -> 5.6

See merge request !41
parents 2e80a64e 87c42ca6
Pipeline #311239 failed with stage
in 1 minute and 7 seconds