Commit Graph

5 Commits

Author SHA1 Message Date
9bebbe9a6c Merge remote-tracking branch 'origin/master' into error-info
# Conflicts:
#	app/controllers/concerns/submission_scoring.rb
#	app/views/application/_navigation.html.slim
#	config/locales/de.yml
#	config/locales/en.yml
#	db/schema.rb
2017-10-15 17:02:19 +02:00
44a3cabe98 Scaffold exercise collection routes 2017-09-27 16:08:56 +02:00
f77c7410e1 Add subscription controller 2017-09-06 16:18:44 +02:00
0c8c8562f5 Scaffold error template attributes 2017-07-12 11:58:18 +02:00
4d38195c99 Scaffold error_templates UI 2017-07-12 10:11:52 +02:00