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

# Conflicts:
#	db/schema.rb

2017-12-13 13:15:29 +01:00

..

controllers

Merge pull request #136 from openHPI/fix-tests

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

factories

rename factory_girl_(rails) to factory_bot_(rails)

2017-11-15 15:18:07 +01:00

mailers/previews

Format anomaly data in mails

2017-12-13 12:57:45 +01:00

models

Merge pull request #136 from openHPI/fix-tests

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