mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-25 14:46:46 +00: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. |
||
---|---|---|
.. | ||
trends | ||
account_moderation_notes_helper.rb | ||
action_logs_helper.rb | ||
announcements_helper.rb | ||
dashboard_helper.rb | ||
filter_helper.rb | ||
settings_helper.rb |