mirror of
https://github.com/funamitech/mastodon
synced 2024-12-05 10:18:45 +09:00
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. |
||
---|---|---|
.. | ||
admin | ||
filters_controller.rb | ||
instances_controller.rb | ||
media_controller.rb | ||
search_controller.rb | ||
suggestions_controller.rb |