Karina Kwiatek 391f4a28ed Merge branch 'master' into feature/announcements ... # Conflicts: # db/schema.rb		2020-04-19 21:52:58 +01:00
..
factories	Remove useless specs	2020-04-19 22:31:43 +02:00
helpers	Merge branch 'master' into feature/announcements	2020-04-19 21:52:58 +01:00
integration	Use Rolify for admin and moderator roles	2020-04-19 22:35:58 +02:00
models	Merge branch 'master' into feature/announcements	2020-04-19 21:52:58 +01:00
support	Remove useless specs	2020-04-19 22:31:43 +02:00
rails_helper.rb	Remove useless specs	2020-04-19 22:31:43 +02:00
spec_helper.rb	Remove useless specs	2020-04-19 22:31:43 +02:00