mirror of https://github.com/Siphonay/mastodon
c2f0ea415e
Conflicts: - `app/javascript/packs/admin.jsx`: Changes split in `app/javascript/core/admin.js` and `app/javascript/flavours/glitch/packs/admin.jsx`. |
||
---|---|---|
.. | ||
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 |