mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-24 02:12:17 +00:00
Merge branch 'master' into feature-60973/komponente_fuer_lehrfaecherverteilung
# Conflicts: # application/models/education/Lehrveranstaltung_model.php # application/models/organisation/Studienplan_model.php # application/models/person/Notiz_model.php # application/models/ressource/Mitarbeiter_model.php # public/js/components/Stv/Studentenverwaltung.js # public/js/components/Stv/Studentenverwaltung/Verband.js # system/dbupdate_3.4.php # system/phrasesupdate.php
This commit is contained in:
@@ -74,6 +74,9 @@ require_once('dbupdate_3.4/55968_index_anrechnung.php');
|
||||
require_once('dbupdate_3.4/25999_locale_update.php');
|
||||
require_once('dbupdate_3.4/55289_pep_fine_tuning.php');
|
||||
require_once('dbupdate_3.4/55614_perm_verwaltetoe.php');
|
||||
require_once('dbupdate_3.4/25999_C4_dashboard.php');
|
||||
require_once('dbupdate_3.4/61730_Dashboard_Anpassungen.php');
|
||||
require_once('dbupdate_3.4/40128_search.php');
|
||||
require_once('dbupdate_3.4/60882_lehrfaecherverteilung_favorites.php');
|
||||
|
||||
// *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
|
||||
|
||||
Reference in New Issue
Block a user