Commit Graph

2 Commits

Author SHA1 Message Date
paolo 030fe2ba74 Merge origin/ci into ci
Conflicts:
	application/core/FHC_Model.php
	application/models/Nation_model.php
	application/models/lehre/Studiengang_model.php
	application/models/lehre/Studienplan_model.php
2016-05-04 15:34:00 +02:00
Paminger 6836c3608d Models 2016-05-04 07:05:23 +02:00