mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-09-11 20:57:44 +00:00
Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js`: glitch-soc change because of having changed the default number of available poll options. Applied upstream's changes while keeping glitch-soc's default number of poll options. - `public/oops.png`: We had a minor graphics change, probably not worth diverging from upstream. Took upstream version. |
||
---|---|---|
.. | ||
avatars/original | ||
emoji | ||
headers/original | ||
ocr/lang-data | ||
sounds | ||
500.html | ||
background-cybre.png | ||
badge.png | ||
clock.js | ||
embed.js | ||
favicon.ico | ||
inert.css | ||
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 |