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

..

migrate

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

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

seeds

merge master

2016-07-14 13:22:24 +02:00

schema.rb

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

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

seeds.rb

fixed multiple style guide violations

2015-02-17 10:23:01 +01:00

structure.sql

add structure.sql

2017-02-02 18:24:21 +01:00