oesi b8177b58e8 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

2017-01-20 11:05:08 +01:00

..

.gitignore

.gitignore Files added

2015-01-18 09:54:15 +01:00

cis.config-default.inc.php

Merge branch 'master' into ci

2017-01-20 11:05:08 +01:00

global.config-default.inc.php

Merge branch 'master' into ci

2016-11-22 13:58:29 +01:00

system.config-default.inc.php

phpci

2016-11-30 13:24:40 +01:00

vilesci.config-default.inc.php

phpci

2016-11-30 13:24:40 +01:00

wawi.config-default.inc.php

phpci

2016-11-30 13:24:40 +01:00