Merge origin/master

Browse Source

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

...

This commit is contained in:

cris-technikum

2017-10-31 11:29:18 +01:00

parent 1c12d72318

commit f3412e75c7

1 changed files with 4386 additions and 4379 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

content/student/studentDBDML.php

+4386 -4379

File diff suppressed because it is too large Load Diff