Sebastian Serth 1a26d67c82 Merge branch 'master' into add_roles_via_LTI ...

# Conflicts:
#	app/views/application/_breadcrumbs.html.slim
#	app/views/application/welcome.html.slim
#	app/views/exercise_collections/show.html.slim
#	app/views/external_users/index.html.slim
#	app/views/layouts/application.html.slim
#	app/views/proxy_exercises/index.html.slim
#	app/views/user_exercise_feedbacks/index.html.slim
#	app/views/user_mailer/send_thank_you_note.slim

2018-12-14 00:53:06 +01:00

..

migrate

Merge branch 'master' into add_roles_via_LTI

2018-12-14 00:53:06 +01:00

seeds

Completely remove old non-structured errors and migrate existing ones.

2018-11-30 11:27:25 +01:00

schema.rb

Merge branch 'master' into add_roles_via_LTI

2018-12-14 00:53:06 +01:00

seeds.rb

Upgrade Rails to version 5.2.1 and adopt code & specs where necessary

2018-11-06 16:46:00 +01:00

structure.sql

add structure.sql

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