Maximilian Grundke c1b5df044b Merge remote-tracking branch 'origin/master' into exercise-anomaly-detection ...

# Conflicts:
#	Capfile
#	Gemfile.lock
#	db/schema.rb

2018-02-28 16:48:14 +01:00

..

controllers

Merge pull request #136 from openHPI/fix-tests

2017-11-01 10:10:04 +01:00

factories

Fix Factories

2018-02-22 17:19:53 +01:00

mailers/previews

Rename FactoryGirl

2017-12-20 10:27:52 +01:00

models

Merge pull request #136 from openHPI/fix-tests

2017-11-01 10:10:04 +01:00