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

..

de-AT

Merge branch 'master' into ci

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

de-SFU

SFU FAS.DTD

2015-11-13 13:26:26 +01:00

en-US

Merge branch 'master' into ci

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

it-IT

Prüfungsmodul Bugfixes und Erweiterungen

2017-01-09 19:15:31 +01:00

contents.rdf

2006-11-27 08:46:23 +00:00