mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-25 01:24:02 -05:00
60298af3c4
Conflicts: - `app/views/layouts/application.html.haml`: Upstream changed how the `inert.css` file is included. The conflict is caused by glitch-soc's theming system. Ported the upstream change. Additional changes: - `config/webpack/shared.js`: bypass glitch-soc's theming system for `inert` pack. |
||
---|---|---|
.. | ||
avatars/original | ||
emoji | ||
headers/original | ||
ocr/lang-data | ||
sounds | ||
500.html | ||
background-cybre.png | ||
badge.png | ||
clock.js | ||
embed.js | ||
favicon.ico | ||
logo-cybre-glitch.gif | ||
oops.gif | ||
oops.png | ||
riot-glitch.png | ||
robots.txt | ||
sw.js | ||
sw.js.map | ||
web-push-icon_expand.png | ||
web-push-icon_favourite.png | ||
web-push-icon_reblog.png |