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
..
common	Update new email templates (#28416)	2024-01-15 18:18:59 +00:00
heading	Merge branch 'glitch-soc' into develop	2024-03-14 20:01:30 +01:00
store-icons	Add attribution to Tabler.io icons used in the new mailer designs (#29470)	2024-03-01 14:51:01 +00:00
welcome	Add attribution to Tabler.io icons used in the new mailer designs (#29470)	2024-03-01 14:51:01 +00:00
welcome-icons	Add attribution to Tabler.io icons used in the new mailer designs (#29470)	2024-03-01 14:51:01 +00:00