blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-25 16:09:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,920 Commits 228 Branches 6 Tags
0f3e299cf4fc79c30feff332a2fdbaa7ac22b97d
Commit Graph

4 Commits

Author SHA1 Message Date
Paminger 4b9d5d273b Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 
Conflicts:
	application/config/fhcomplete.php
	application/core/FHC_Model.php
 2016-05-10 14:36:01 +02:00
Paminger e624540c16 Message 2016-05-10 14:12:33 +02:00
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