Jeremy Kescher 122870cb6b Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # config/initializers/rack_attack.rb # lib/mastodon/version.rb		2022-11-14 22:18:48 +01:00
..
chewy
controllers	Merge remote-tracking branch 'upstream/main' into develop	2022-11-14 22:18:48 +01:00
helpers	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-12 13:28:03 +01:00
javascript	Merge remote-tracking branch 'upstream/main' into develop	2022-11-14 22:18:48 +01:00
lib	Merge remote-tracking branch 'upstream/main' into develop	2022-11-14 22:18:48 +01:00
mailers	Add support for language preferences for trending statuses and links (#18288)	2022-10-08 16:45:40 +02:00
models	Merge remote-tracking branch 'upstream/main' into develop	2022-11-14 22:18:48 +01:00
policies	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-10 09:36:47 +01:00
presenters	Change sign-in banner to reflect disabled or moved account status (#19773)	2022-11-05 18:28:13 +01:00
serializers	Merge remote-tracking branch 'upstream/main' into develop	2022-11-10 21:11:05 +01:00
services	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-14 08:35:55 +01:00
validators	Merge remote-tracking branch 'upstream/main' into develop	2022-10-31 21:37:48 +01:00
views	Merge remote-tracking branch 'upstream/main' into develop	2022-11-14 22:18:48 +01:00
workers	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-12 13:28:03 +01:00