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 | |
---|---|---|
.. | ||
trends | 2 years ago | |
account_moderation_notes_helper.rb | ||
action_logs_helper.rb | 2 years ago | |
announcements_helper.rb | ||
dashboard_helper.rb | ||
filter_helper.rb | 2 years ago | |
settings_helper.rb | 2 years ago |