Merge origin/master

Conflicts:
	cis/testtool/login.php
	vilesci/stammdaten/reihungstestverwaltung.php
This commit is contained in:
cris-technikum
2017-09-20 13:09:17 +02:00
241 changed files with 9435 additions and 17489 deletions
+1 -1
View File
@@ -409,4 +409,4 @@ if(isset($_POST['save']) && isset($_SESSION['prestudent_id']))
?>
</body>
</html>
</html>