Claire 69737b703a Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: our READMEs are entirely different and upstream's has been updated. Kept our README.		2021-05-17 10:30:34 +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-05-07 18:21:59 +02:00
helpers	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-07 18:21:59 +02:00
javascript	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-17 10:30:34 +02:00
lib	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-12 11:03:05 +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-05-17 10:30:34 +02:00
policies	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-07 18:21:59 +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-05-17 10:30:34 +02:00
services	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-12 11:03:05 +02:00
validators	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-07 18:21:59 +02:00
views	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-07 18:21:59 +02:00
workers	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-12 11:03:05 +02:00