Johann Hoffmann d9f5646ad1 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

2024-09-10 10:17:55 +02:00

..

frontend

Merge branch 'master' into feature-40896/kennzeichnung_unruly_person

2024-09-10 10:17:55 +02:00

v1

style anpassungen und funktionen geloescht

2022-09-14 11:57:23 +02:00

index.html

RESTv1

2016-03-11 10:08:34 +01:00