Jeremy Kescher fae98d1deb Merge branch 'refs/heads/glitch-soc' into develop ... # Conflicts: # app/javascript/flavours/glitch/initial_state.js # app/javascript/mastodon/initial_state.js		2024-05-20 23:57:04 +02:00
..
admin_mailer.rb	Add list of pending releases directly in mail notifications for version updates (#29436)	2024-03-26 14:45:19 +00:00
application_mailer.rb	Fix rails mailer preview not honouring locale (#28418)	2023-12-18 21:49:17 +00:00
notification_mailer.rb	Merge branch 'glitch-soc' into develop	2024-01-17 22:37:29 +01:00
user_mailer.rb	Remove duplicate method def ApplicationHelper#instance_presenter (#30331)	2024-05-17 08:29:13 +00:00