forked from mirrors/catstodon
You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
0ad919b192
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. |
2 years ago | |
---|---|---|
.. | ||
avatars/original | 2 years ago | |
emoji | 2 years ago | |
headers/original | 2 years ago | |
ocr/lang-data | 5 years ago | |
sounds | 7 years ago | |
500.html | 6 years ago | |
background-cybre.png | 7 years ago | |
badge.png | 2 years ago | |
clock.js | 7 years ago | |
embed.js | 2 years ago | |
favicon.ico | 2 years ago | |
inert.css | 4 years ago | |
logo-cybre-glitch.gif | 7 years ago | |
oops.gif | 7 years ago | |
oops.png | 2 years ago | |
riot-glitch.png | 7 years ago | |
robots.txt | 5 years ago | |
sw.js | 2 years ago | |
sw.js.map | 2 years ago | |
web-push-icon_expand.png | 2 years ago | |
web-push-icon_favourite.png | 2 years ago | |
web-push-icon_reblog.png | 2 years ago |