Skip to content
Commit 8a4d6ef4 authored by Till Brehm's avatar Till Brehm
Browse files

Merge branch 'master' into 'master'

added support for newer versions of mariadb-server, removed spaces after ?> of file causing empty lines in cron log, ftp settings added



See merge request !514
parents 84006c5d 208276b9
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment