Merge branch 'master' into feature-60873/GesamtnoteneingabeCis4

Browse Source

# Conflicts:
#	application/config/routes.php
#	application/models/crm/Prestudent_model.php
#	application/models/education/Lehreinheit_model.php
#	application/models/education/Lehrveranstaltung_model.php
#	public/js/apps/Dashboard/Fhc.js
#	system/phrasesupdate.php

...

This commit is contained in:

Johann Hoffmann

2025-11-25 10:50:26 +01:00

parent 4956a517ca f0e0bdc082

commit 1c236cce02

302 changed files with 25025 additions and 3695 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

system/phrasesupdate.php

+4858 -91

File diff suppressed because it is too large Load Diff