Thibaut Girka abcba5c198 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - package.json Not really a conflict, caused by an additional dependency in glitch-soc. - yarn.lock Not really a conflict, caused by an additional dependency in glitch-soc.		2019-12-07 12:28:59 +01:00
..
chewy	Fix needlessly indexing unsearchable statuses into ElasticSearch (#12041)	2019-10-02 20:04:46 +02:00
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2019-12-07 12:28:59 +01:00
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2019-12-07 12:28:59 +01:00
javascript	Merge branch 'master' into glitch-soc/merge-upstream	2019-12-07 12:28:59 +01:00
lib	Merge branch 'master' into glitch-soc/merge-upstream	2019-12-07 12:28:59 +01:00
mailers	Split AccountsHelper from StatusesHelper (#12078)	2019-10-24 22:50:09 +02:00
models	Merge branch 'master' into glitch-soc/merge-upstream	2019-12-07 12:28:59 +01:00
policies	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-06 13:16:53 +02:00
presenters	Merge branch 'master' into glitch-soc/merge-upstream	2019-11-30 17:29:44 +01:00
serializers	Merge branch 'master' into glitch-soc/merge-upstream	2019-12-07 12:28:59 +01:00
services	Merge branch 'master' into glitch-soc/merge-upstream	2019-12-07 12:28:59 +01:00
validators	Increase poll option length limit to 100 chars, number of options to 5	2019-10-10 20:13:59 +02:00
views	Merge branch 'master' into glitch-soc/merge-upstream	2019-12-07 12:28:59 +01:00
workers	Merge branch 'master' into glitch-soc/merge-upstream	2019-11-07 13:43:56 +01:00