kindlm 9f109127a5 Merge remote-tracking branch 'origin/master' ...

# Conflicts:
#	cis/private/profile/studienplan.php
#	locale/de-AT/pruefung.php
#	locale/en-US/pruefung.php
#	locale/it-IT/pruefung.php
#	vilesci/lehre/lv_merge.php

2016-06-01 17:09:10 +02:00

..

cisdocs

re-add Files deleted from History

2015-01-18 09:26:16 +01:00

infoterminal

- Fehlermeldung am Infoterminal entfernt

2015-05-28 17:19:29 +02:00

private

Merge remote-tracking branch 'origin/master'

2016-06-01 17:09:10 +02:00

public

ital. phrases

2016-05-30 17:32:50 +02:00

testtool

Testtool neues Logo, Antworten löschen

2016-01-25 16:48:29 +01:00

ampel.php

FHC-Website Anpassungen auf fhcomplete.org und GmbH

2014-01-30 15:47:10 +00:00

index_login.php

Anpassungen an CIS-Redesign

2013-07-19 15:32:08 +00:00

index.html

Logo von DEFAULT_STYLE; Neuer Ordner styles/default

2015-10-16 12:19:38 +02:00

index.php

Logo von DEFAULT_STYLE; Neuer Ordner styles/default

2015-10-16 12:19:38 +02:00

menu.php

attendance view for lectors and students

2015-02-03 14:08:43 +01:00