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

..

migrate

Merge branch 'master' into feature-file-templates

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

seeds

merge master

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

schema.rb

Merge branch 'master' into feature-file-templates

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

seeds.rb

fixed multiple style guide violations

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