Thibaut Girka 246c313d45 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/application_controller.rb Changed instance theme selection by instance flavour selection.		2018-08-24 15:10:34 +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-24 15:10:34 +02:00
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-22 20:56:32 +02:00
javascript	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-24 15:10:34 +02:00
lib	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-24 15:10:34 +02:00
mailers	Account archive download (#6460)	2018-02-21 23:21:32 +01:00
models	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-24 15:10:34 +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	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-24 15:10:34 +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-24 15:10:34 +02:00
workers	Revert to using Paperclip's filesystem storage, and fix dangling records in remove_remote (#8339)	2018-08-21 17:53:01 +02:00