htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into editor-frontend-refactor

Browse Source 
Conflicts:
	app/assets/javascripts/editor.js.erb
	app/views/exercises/implement.html.slim
This commit is contained in:
Ralf Teusner
2016-09-02 15:04:18 +02:00
parent 18c8927e86 012e11857f
commit b8da4dea17
14 changed files with 178 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -6,6 +6,7 @@
/config/smtp.yml
/config/docker.yml.erb
/config/*.production.yml
/config/*.staging.yml
/coverage
/log
/public/assets