silas 355a49bada Merge remote-tracking branch 'origin/master' ...

# Conflicts:
#	public/css/wordRotator.css

2018-10-22 23:09:09 +02:00

..

img

Tests angepasst

2018-09-20 18:09:46 +02:00

js

update für die Vorlesung

2018-10-22 23:07:57 +02:00

module/Application

Merge remote-tracking branch 'origin/master'

2018-10-22 23:09:09 +02:00

scss

update für die Vorlesung

2018-10-22 23:07:57 +02:00

sound

changed music to mp3

2018-09-26 14:54:46 +02:00