Maximilian Grundke 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

..

assets

Merge remote-tracking branch 'origin/master' into error-info

2017-10-15 17:02:19 +02:00

controllers

Merge remote-tracking branch 'origin/master' into error-info

2017-10-15 17:02:19 +02:00

helpers

Scaffold error template attributes

2017-07-12 11:58:18 +02:00

mailers

Add unsubscribe link to emails and cleanup user mailer

2017-09-13 14:37:10 +02:00

models

Merge remote-tracking branch 'origin/master' into error-info

2017-10-15 17:02:19 +02:00

policies

Merge remote-tracking branch 'origin/master' into error-info

2017-10-15 17:02:19 +02:00

uploaders

transferred Code Ocean from original repository to GitHub

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

views

Merge remote-tracking branch 'origin/master' into error-info

2017-10-15 17:02:19 +02:00