Thibaut Girka 6f75a9001f Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/stream_entries/_simple_status.html.haml - config/locales/nl.yml Deleted unused translation strings (themes) and adapted minor changes to _simple_status.html.haml		2018-08-31 19:10:57 +02:00
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-27 18:09:28 +02:00
fabricators	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-28 17:24:39 +02:00
features
fixtures
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-26 14:23:24 +02:00
lib	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-31 19:10:57 +02:00
mailers
models	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-31 19:10:57 +02:00
policies
presenters
requests
routing
services	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-22 20:56:32 +02:00
support
validators
views	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-31 19:10:57 +02:00
workers
rails_helper.rb
spec_helper.rb