mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-06-14 18:49:28 +00:00
5b3d06f1e0
# Conflicts: # application/controllers/api/frontend/v1/Lehre.php # application/models/education/Note_model.php # application/views/CisRouterView/CisRouterView.php # public/css/Cis4/Cis.css # system/phrasesupdate.php