Ralf Teusner b8da4dea17 Merge branch 'master' into editor-frontend-refactor ...

Conflicts:
	app/assets/javascripts/editor.js.erb
	app/views/exercises/implement.html.slim

2016-09-02 15:04:18 +02:00

..

images

transferred Code Ocean from original repository to GitHub

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

javascripts

Merge branch 'master' into editor-frontend-refactor

2016-09-02 15:04:18 +02:00

stylesheets

set height of ace editor to 600px.

2016-09-01 18:47:32 +02:00