mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-04 12:34:32 +00:00
aae60a2366
Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/concerns/two_factor_authentication_concern.rb`: Conflict due to glitch-soc's theming system. Ported upstream changes. |
||
|---|---|---|
| .. | ||
| activitypub | ||
| admin | ||
| api | ||
| auth | ||
| concerns | ||
| oauth | ||
| settings | ||
| well_known | ||
| about_controller.rb | ||
| account_follow_controller.rb | ||
| account_unfollow_controller.rb | ||
| accounts_controller.rb | ||
| application_controller.rb | ||
| authorize_interactions_controller.rb | ||
| custom_css_controller.rb | ||
| directories_controller.rb | ||
| emojis_controller.rb | ||
| filters_controller.rb | ||
| follower_accounts_controller.rb | ||
| following_accounts_controller.rb | ||
| home_controller.rb | ||
| instance_actors_controller.rb | ||
| intents_controller.rb | ||
| invites_controller.rb | ||
| manifests_controller.rb | ||
| media_controller.rb | ||
| media_proxy_controller.rb | ||
| public_timelines_controller.rb | ||
| relationships_controller.rb | ||
| remote_follow_controller.rb | ||
| remote_interaction_controller.rb | ||
| shares_controller.rb | ||
| statuses_controller.rb | ||
| tags_controller.rb | ||