Commit Graph

1 Commits

Author SHA1 Message Date
kindlm 8c8753b667 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
# Conflicts:
#	include/studienplan.class.php
2016-06-01 16:52:57 +02:00