Merge remote-tracking branch 'upstream/develop' into camelCaps

2018-09-01 13:52:51 +02:00
parent 5100b8b7b0 59a27085fd
commit 57fb3dc2f4
414 changed files with 279 additions and 860 deletions
--- a/htdocs/core/class/CSMSFile.class.php
+++ b/htdocs/core/class/CSMSFile.class.php
@@ -246,5 +246,4 @@ class CSMSFile
            @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
        }
    }
-
 }