Jeremy Kescher 48373a71e3 Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # Gemfile.lock # app/javascript/flavours/glitch/components/status_action_bar.js # app/javascript/flavours/glitch/containers/status_container.js # app/javascript/flavours/glitch/features/status/components/action_bar.js # app/javascript/flavours/glitch/locales/de.json # app/javascript/flavours/glitch/locales/fr.json # app/javascript/mastodon/components/status_action_bar.js # app/javascript/mastodon/features/status/components/action_bar.js # config/locales-glitch/de.yml # config/locales-glitch/fr.yml # config/locales-glitch/simple_form.de.yml # config/locales-glitch/simple_form.fr.yml		2023-01-05 23:29:53 +01:00
..
chewy
controllers	Merge remote-tracking branch 'upstream/main' into develop	2023-01-05 23:29:53 +01:00
helpers	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
javascript	Merge remote-tracking branch 'upstream/main' into develop	2023-01-05 23:29:53 +01:00
lib	Merge remote-tracking branch 'upstream/main' into develop	2023-01-05 23:29:53 +01:00
mailers	Add single splat to callback method definitions to avoid ArgumentError (#22246)	2022-12-13 20:03:16 +01:00
models	Merge remote-tracking branch 'upstream/main' into develop	2023-01-05 23:29:53 +01:00
policies	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-17 12:01:37 +01:00
presenters	Add follow request banner on account header (#20785)	2022-12-15 18:50:11 +01:00
serializers	Merge remote-tracking branch 'upstream/main' into develop	2023-01-05 23:29:53 +01:00
services	Merge remote-tracking branch 'upstream/main' into develop	2023-01-05 23:29:53 +01:00
validators	Merge remote-tracking branch 'upstream/main' into develop	2023-01-05 23:29:53 +01:00
views	Merge remote-tracking branch 'upstream/main' into develop	2023-01-05 23:29:53 +01:00
workers	Merge remote-tracking branch 'upstream/main' into develop	2022-12-16 17:53:33 +01:00