mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-06-01 20:29:29 +00:00
5d7281e470
# Conflicts: # application/controllers/api/frontend/v1/Abgabe.php # public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js # public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js # public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js # public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js # system/phrasesupdate.php