Claire 1665b84285 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Not really a conflict, just a glitch-soc-only dependency textually too close to an updated upstream one. - `yarn.lock`: Not really a conflict, just a glitch-soc-only dependency textually too close to an updated upstream one.		2021-10-13 15:50:24 +02:00
..
chewy	Change tootctl search deploy algorithm (#14300)	2020-07-14 18:10:35 +02:00
controllers	Merge branch 'main' into glitch-soc/merge-upstream	2021-10-13 15:50:24 +02:00
helpers	Merge branch 'main' into glitch-soc/merge-upstream	2021-07-08 16:17:19 +02:00
javascript	Merge branch 'main' into glitch-soc/merge-upstream	2021-10-13 15:50:24 +02:00
lib	Merge branch 'main' into glitch-soc/merge-upstream	2021-09-30 00:01:20 +02:00
mailers	Prepare Mastodon for Rails 6 (#15911)	2021-03-17 10:09:55 +01:00
models	Merge branch 'main' into glitch-soc/merge-upstream	2021-10-13 15:50:24 +02:00
policies	Merge branch 'main' into glitch-soc/merge-upstream	2021-07-08 16:17:19 +02:00
presenters	Merge branch 'main' into glitch-soc/merge-upstream	2021-02-22 15:23:46 +01:00
serializers	Merge branch 'main' into glitch-soc/merge-upstream	2021-09-14 13:50:30 +02:00
services	Merge branch 'main' into glitch-soc/merge-upstream	2021-09-26 18:28:59 +02:00
validators	Merge branch 'main' into glitch-soc/merge-upstream	2021-07-11 21:41:23 +02:00
views	Merge branch 'main' into glitch-soc/merge-upstream	2021-09-14 13:50:30 +02:00
workers	Merge branch 'main' into glitch-soc/merge-upstream	2021-08-20 13:01:50 +02:00