Johann Hoffmann 4e6a2d5218 Merge branch 'master' into feature-60873/GesamtnoteneingabeCis4 ...

# Conflicts:
#	application/config/routes.php
#	application/controllers/api/frontend/v1/Lehre.php
#	application/views/CisRouterView/CisRouterView.php
#	cis/private/lehre/notenliste.xls.php
#	public/js/api/factory/lehre.js
#	public/js/apps/Cis/Cis.js
#	public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
#	public/js/helpers/StringHelpers.js
#	system/phrasesupdate.php

2026-07-27 15:41:29 +02:00

..

css

Merge branch 'master' into feature-60873/GesamtnoteneingabeCis4

2026-07-27 15:41:29 +02:00

extensions

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

images

add neutral fhcomplete logo for default theme

2025-06-12 17:38:17 +02:00

js

Merge branch 'master' into feature-60873/GesamtnoteneingabeCis4

2026-07-27 15:41:29 +02:00

media

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

.htaccess_sample

sample .htaccess to use with config option use_fhcomplete_build_version_in_path

2026-02-03 08:13:57 +01:00