Ralf Teusner ed3526a578 Merge branch 'master' into feature-file-templates ...

Conflicts:
	app/views/application/_navigation.html.slim
	config/locales/de.yml
	config/locales/en.yml
	db/schema.rb

2016-07-28 15:16:11 +02:00

..

_breadcrumbs.html.slim

minor refactoring of flash messages

2015-03-23 16:42:57 +01:00

_flash.html.slim

do not render the development environment for exercises without visible files

2015-03-21 18:46:02 +01:00

_locale_selector.html.slim

transferred Code Ocean from original repository to GitHub

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

_navigation.html.slim

Merge branch 'master' into feature-file-templates

2016-07-28 15:16:11 +02:00

_session.html.slim

Restructure session menu

2016-04-27 18:02:11 +02:00

help.html.slim

remove general help section

2015-12-01 11:09:37 +01:00

welcome.html.slim

text for cover page

2015-03-13 09:12:15 +01:00