Maximilian Grundke 84ea900e4a Merge remote-tracking branch 'origin/master' into activity-graphs ...

# Conflicts:
#	config/locales/de.yml
#	config/locales/en.yml

2018-04-25 15:46:38 +02:00

..

images

transferred Code Ocean from original repository to GitHub

2015-01-22 10:01:32 +01:00

javascripts

Merge remote-tracking branch 'origin/master' into activity-graphs

2018-04-25 15:46:38 +02:00

remote_scripts

prevent replacement of * in student submission files..

2017-05-14 23:10:33 +02:00

stylesheets

Merge remote-tracking branch 'origin/master' into activity-graphs

2018-04-25 15:46:38 +02:00