Ralf Teusner c67c6e38f7 Merge branch 'master' into rt/comments ...

Conflicts:
	app/views/exercises/_editor_file_tree.html.slim

2015-07-16 15:19:31 +02:00

..

images

transferred Code Ocean from original repository to GitHub

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

javascripts

Merge branch 'master' into rt/comments

2015-07-16 15:19:31 +02:00

stylesheets

Merge branch 'pr/14'

2015-04-10 20:39:53 +02:00