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 | |
|---|---|---|
| .. | ||
| exports | ||
| migration | ||
| preferences | ||
| two_factor_authentication | ||
| aliases_controller.rb | ||
| applications_controller.rb | ||
| base_controller.rb | ||
| deletes_controller.rb | 2 years ago | |
| exports_controller.rb | ||
| featured_tags_controller.rb | 2 years ago | |
| flavours_controller.rb | ||
| imports_controller.rb | ||
| login_activities_controller.rb | ||
| migrations_controller.rb | ||
| pictures_controller.rb | ||
| preferences_controller.rb | ||
| profiles_controller.rb | ||
| sessions_controller.rb | ||
| two_factor_authentication_methods_controller.rb | ||