Merge branch 'master' into ci

Conflicts: composer.json composer.lock phpci.yml system/checksystem.php system/dbupdate_3.2.php tests/codeception/_data/dump.sql tests/codeception/tests/acceptance/CISLoginPage.php
2026-07-23 18:02:18 +00:00 · 2017-01-20 11:05:08 +01:00
parent 51b8a15f27 b8ad2dfd0c
commit b8177b58e8
83 changed files with 5390 additions and 5860 deletions
@@ -109,5 +109,4 @@
 	        "merge-extra": false
 	    }
 	}
-  
 }