Merge remote-tracking branch 'origin/master'

Conflicts: inc/init.php
2026-03-06 00:24:08 +01:00 · 2015-02-03 13:33:14 +01:00
parent cd1072d2de 95e922e84f
commit 295ea768eb
1 changed files with 1 additions and 1 deletions
--- a/inc/installer.class.php
+++ b/inc/installer.class.php
@@ -478,4 +478,4 @@ class SP_Installer
        SP_Config::deleteKey('dbpass');
    }

-}
+}