Merge origin/master

Browse Source

Conflicts:
	cis/testtool/login.php
	vilesci/stammdaten/reihungstestverwaltung.php

...

This commit is contained in:

cris-technikum

2017-09-20 13:09:17 +02:00

parent 51a5bda923 81864b14b7

commit 750fcfd6a7

241 changed files with 9437 additions and 17491 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

include/ablauf.class.php

+657 -657

File diff suppressed because it is too large Load Diff