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
..
_attachment_list.html.haml	Use material symbol for filters/statuses views (#31371)	2024-08-20 11:52:27 +00:00
_detailed_status.html.haml	Migrate fontawesome->material in more views (#31360)	2024-08-20 11:52:45 +00:00
_og_description.html.haml	…
_og_image.html.haml	Fix more haml-lint Rubocop (#24107)	2023-03-15 20:07:43 +01:00
_poll.html.haml	Fix haml-lint `UnnecessaryStringOutput` for views (#27531)	2023-10-25 12:01:00 +00:00
_simple_status.html.haml	Merge commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream	2024-08-20 18:31:50 +02:00
_status.html.haml	Cleanup unused portions of statuses/status partial (#26045)	2023-07-19 08:44:16 +02:00
embed.html.haml	…
show.html.haml	Fix haml-lint Rubocop `Style/SlicingWithRange` cop (#25947)	2023-07-17 18:18:13 +02:00