Jeremy Kescher caccc2e0f4 Merge branch 'glitch-soc' into develop ... # Conflicts: # README.md # app/javascript/flavours/glitch/components/status.jsx # app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx # app/javascript/flavours/glitch/locales/en.json # app/javascript/flavours/glitch/reducers/compose.js # app/javascript/flavours/glitch/styles/components.scss # app/javascript/mastodon/reducers/compose.js # app/models/notification.rb		2024-03-14 20:01:30 +01:00
..
admin_mailer.rb	Automatically switch from open to approved registrations in absence of moderators (#29318)	2024-02-22 20:45:40 +01: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	New welcome email (#28883)	2024-03-01 12:16:53 +00:00