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
..
chewy	Get rid of Chewy order/limit warning (#8355)	2018-08-22 02:44:56 +02:00
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-31 19:10:57 +02:00
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-31 19:10:57 +02:00
javascript	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-31 19:10:57 +02:00
lib	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-31 19:10:57 +02:00
mailers	Fix low-hanging rubocop gripes (#8458)	2018-08-26 19:22:46 +02:00
models	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-31 19:10:57 +02:00
policies	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-24 15:10:34 +02:00
presenters	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-24 15:10:34 +02:00
serializers	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-24 15:10:34 +02:00
services	Add bookmarks to archive takeout	2018-08-30 16:29:47 +02:00
validators	Merge branch 'master' into glitch-soc/merge-upstream	2018-07-26 21:22:43 +02:00
views	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-31 19:10:57 +02:00
workers	Add CLI task for rotating keys (#8466)	2018-08-26 20:21:03 +02:00