Karina Kwiatek 391f4a28ed Merge branch 'master' into feature/announcements ... # Conflicts: # db/schema.rb		2020-04-19 21:52:58 +01:00
..
announcement_spec.rb	Create Announcement model & controller	2020-04-19 20:12:22 +01:00
question_spec.rb	Replace FactoryGirl with FactoryBot	2020-04-19 17:27:42 +02:00
user_spec.rb	more specs!	2014-12-07 11:33:26 +01:00