mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-12 21:36:43 +00:00
040b7d37a4
Conflicts: - `app/services/remove_status_service.rb`: Conflict due to glitch-soc having extra code for a proper direct visibility timeline, in a part of the code upstream refactored. Restored glitch-soc's extra code in the refactored bit. |
||
---|---|---|
.. | ||
exports | ||
migration | ||
preferences | ||
two_factor_authentication | ||
aliases_controller.rb | ||
applications_controller.rb | ||
base_controller.rb | ||
deletes_controller.rb | ||
exports_controller.rb | ||
featured_tags_controller.rb | ||
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 |