mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-25 08:34:29 +00:00
Merge branch 'master' into feature-40896/kennzeichnung_unruly_person
# Conflicts: # application/models/crm/Prestudentstatus_model.php # public/js/api/fhcapifactory.js # system/dbupdate_3.4.php # system/phrasesupdate.php
This commit is contained in:
@@ -56,6 +56,8 @@ require_once('dbupdate_3.4/36530_bis_internationsalisierung_codextabelle_neuerun
|
||||
require_once('dbupdate_3.4/34543_ux_template.php');
|
||||
require_once('dbupdate_3.4/17513_Entwicklungsteam.php');
|
||||
require_once('dbupdate_3.4/28575_softwarebereitstellung.php');
|
||||
require_once('dbupdate_3.4/41150_oe-pfad_db_view.php');
|
||||
require_once('dbupdate_3.4/44031_stv_favorites.php');
|
||||
require_once('dbupdate_3.4/40896_kennzeichnung_unruly_person.php');
|
||||
|
||||
// *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
|
||||
|
||||
Reference in New Issue
Block a user