Claire d1780fb9a4 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/ISSUE_TEMPLATE/bug_report.md`: Removed upstream, while we had a checkbox telling people to check if the issue was present upstream. Removed the file as well.		2021-06-30 00:42:52 +02:00
..
chewy	Change tootctl search deploy algorithm (#14300)	2020-07-14 18:10:35 +02:00
controllers	Fix login date not showing up in login history by using “public” pack	2021-06-23 12:21:40 +02:00
helpers	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-22 13:11:31 +02:00
javascript	Merge branch 'main' into glitch-soc/merge-upstream	2021-06-30 00:42:52 +02:00
lib	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-22 13:11:31 +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-06-23 10:46:24 +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-06-30 00:42:52 +02:00
services	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-22 13:11:31 +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-06-30 00:42:52 +02:00
workers	Merge branch 'main' into glitch-soc/merge-upstream	2021-06-24 08:08:02 +02:00