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

Conflicts:
	app/assets/javascripts/editor.js.erb
---> kept refactored one

2016-09-09 14:17:42 +02:00

..

de.yml

Merge branch 'master' into editor-frontend-refactor

2016-09-09 14:17:42 +02:00

en.yml

Merge branch 'master' into editor-frontend-refactor

2016-09-09 14:17:42 +02:00