Jeremy Kescher 855b0d4dbb Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # .github/workflows/build-image.yml # lib/mastodon/version.rb		2023-01-26 17:27:01 +01:00
..
chewy
controllers	Merge remote-tracking branch 'upstream/main' into develop	2023-01-18 22:29:27 +01:00
helpers	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-24 20:32:31 +01:00
javascript	Merge remote-tracking branch 'upstream/main' into develop	2023-01-26 17:27:01 +01:00
lib	Merge remote-tracking branch 'upstream/main' into develop	2023-01-22 11:33:25 +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-26 17:27:01 +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-26 17:27:01 +01:00
services	Merge remote-tracking branch 'upstream/main' into develop	2023-01-26 17:27:01 +01:00
validators	Merge remote-tracking branch 'upstream/main' into develop	2023-01-26 17:27:01 +01:00
views	Merge remote-tracking branch 'upstream/main' into develop	2023-01-26 17:27:01 +01:00
workers	Merge remote-tracking branch 'upstream/main' into develop	2022-12-16 17:53:33 +01:00