Thibaut Girka dbe311f0e9 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/simple_form.pl.yml		2019-01-16 14:20:07 +01: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	2019-01-10 21:00:30 +01:00
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-13 14:41:06 +01:00
javascript	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-16 14:20:07 +01:00
lib	Revert "Revert "Add handler for Move activity (#9629)""	2019-01-10 18:46:17 +01:00
mailers	Improve e-mail digest (#9689)	2019-01-02 10:47:32 +01:00
models	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-10 21:00:30 +01:00
policies	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-10 21:00:30 +01:00
presenters	Merge branch 'master' into glitch-soc/merge-upstream	2018-11-29 19:22:52 +01:00
serializers	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-10 21:00:30 +01:00
services	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-16 14:20:07 +01:00
validators	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-10 21:00:30 +01:00
views	Display a double reply arrow on public pages for toots that are replies (#9808)	2019-01-14 17:29:04 +01:00
workers	Revert "Revert "Add handler for Move activity (#9629)""	2019-01-10 18:46:17 +01:00