Merge remote-tracking branch 'origin/master' into feature-60873/GesamtnoteneingabeCis4

Browse Source

# Conflicts:
#	application/config/routes.php
#	application/controllers/api/frontend/v1/Lehre.php
#	application/models/education/Lehrveranstaltung_model.php
#	application/views/CisRouterView/CisRouterView.php
#	public/js/apps/Dashboard/Fhc.js
#	system/phrasesupdate.php

...

This commit is contained in:

Johann Hoffmann

2025-08-07 15:17:10 +02:00

parent 367204a1ee 73d269d54b

commit 3c9db86df2

413 changed files with 38524 additions and 7066 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

+5659 -11

File diff suppressed because it is too large Load Diff