mirror of https://github.com/glitch-soc/mastodon
f5c0c32edd
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. |
||
---|---|---|
.. | ||
400-20px | ||
400-24px | ||
LICENSE | ||
README.md |
README.md
Files in this directory are Material Symbols icons fetched using the icons:download
task.