forked from treehouse/mastodon
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. |
||
---|---|---|
.. | ||
4096x4097.png | ||
attachment.gif | ||
attachment.jpg | ||
attachment.webm | ||
avatar.gif | ||
bookmark-imports.txt | ||
boop.ogg | ||
domain_allows.csv | ||
domain_blocks.csv | ||
emojo.png | ||
imports.txt | ||
mini-static.gif | ||
mute-imports.txt | ||
new-following-imports.txt | ||
new-mute-imports.txt |