mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-10-12 15:04:04 +00:00
Merge branch 'master' into feature-75469/LeOptional4Projektarbeit
# 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
This commit is contained in:
@@ -143,6 +143,7 @@ foreach($ps->result as $row)
|
||||
<ROLLE:updatevon><![CDATA['.$row->updatevon.']]></ROLLE:updatevon>
|
||||
<ROLLE:stichtagsaktiv><![CDATA['.$stichtagsaktiv.']]></ROLLE:stichtagsaktiv>
|
||||
<ROLLE:aktiv><![CDATA['.$aktiv.']]></ROLLE:aktiv>
|
||||
<ROLLE:fgm><![CDATA['.$row->fgm.']]></ROLLE:fgm>
|
||||
</RDF:Description>
|
||||
</RDF:li>
|
||||
';
|
||||
|
||||
Reference in New Issue
Block a user