Claire f5c0c32edd Merge commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/material-icons/400-24px/chat.svg`: Glitch-soc used this one but not upstream. Upstream pulled a presumably more up-to-date version of the file. Switched to upstream's version. - `app/views/layouts/application.html.haml`: Upstream removed use of font-awesome. I hope we are ready. - `app/views/layouts/embedded.html.haml`: Upstream removed use of font-awesome. I hope we are ready. - `app/views/layouts/error.html.haml`: Upstream removed use of font-awesome. I hope we are ready.		2024-08-20 18:31:50 +02:00
..
admin_mailer.text.erb	Use admin_mailer layout with initial salutation (#28085)	2023-11-28 07:41:26 +00:00
admin.html.haml	Merge commit '85152af95f51642bcef0ba781a1e7213d79e8f03' into glitch-soc/merge-upstream	2024-08-11 21:05:09 +02:00
application.html.haml	Merge commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream	2024-08-20 18:31:50 +02:00
auth.html.haml	Replace use_pack, layouts/theme and @theme by new helpers	2024-04-28 15:45:42 +02:00
embedded.html.haml	Merge commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream	2024-08-20 18:31:50 +02:00
error.html.haml	Merge commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream	2024-08-20 18:31:50 +02:00
helper_frame.html.haml	Change interaction modal in web UI (#26075)	2023-07-27 16:11:17 +02:00
mailer.html.haml	Drop hardcoded reliance on vanilla flavor	2024-04-28 22:38:11 +02:00
mailer.text.erb	Replace tutorial modal with welcome e-mail (#6273)	2018-01-18 19:17:25 +01:00
modal.html.haml	Merge commit '85152af95f51642bcef0ba781a1e7213d79e8f03' into glitch-soc/merge-upstream	2024-08-11 21:05:09 +02:00