Jeremy Kescher ddc4022845 Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # Gemfile.lock # app/javascript/flavours/glitch/initial_state.js # app/javascript/mastodon/initial_state.js # app/lib/feed_manager.rb # app/services/batched_remove_status_service.rb # lib/mastodon/feeds_cli.rb		2023-03-15 14:13:29 +01:00
..
chewy	Revert reverting "Change algorithm of tootctl search deploy to improve performance (#18463)".	2022-05-26 20:58:16 +02:00
controllers	Merge remote-tracking branch 'upstream/main' into develop	2023-03-15 14:13:29 +01:00
helpers	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-02 17:32:38 +01:00
javascript	Merge remote-tracking branch 'upstream/main' into develop	2023-03-15 14:13:29 +01:00
lib	Merge remote-tracking branch 'upstream/main' into develop	2023-03-15 14:13:29 +01:00
mailers	Add mail headers to avoid auto-replies (#23597)	2023-03-03 20:44:46 +01:00
models	Merge remote-tracking branch 'upstream/main' into develop	2023-03-15 14:13:29 +01:00
policies	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-17 12:01:37 +01:00
presenters	Remove unused InstancePresenter#sample_accounts method (#23900)	2023-02-27 19:03:35 +01:00
serializers	Merge remote-tracking branch 'upstream/main' into develop	2023-03-15 14:13:29 +01:00
services	Merge remote-tracking branch 'upstream/main' into develop	2023-03-15 14:13:29 +01:00
validators	Merge remote-tracking branch 'upstream/main' into develop	2023-03-15 14:13:29 +01:00
views	Merge remote-tracking branch 'upstream/main' into develop	2023-03-15 14:13:29 +01:00
workers	Merge remote-tracking branch 'upstream/main' into develop	2023-03-15 14:13:29 +01:00