mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-20 05:44:01 +00:00
bb6988a7ac
# Conflicts: # app/controllers/settings/exports_controller.rb # app/models/media_attachment.rb # app/models/status.rb # app/views/about/show.html.haml # docker_entrypoint.sh # spec/views/about/show.html.haml_spec.rb |
||
---|---|---|
.. | ||
exports | ||
two_factor_authentication | ||
applications_controller.rb | ||
base_controller.rb | ||
deletes_controller.rb | ||
exports_controller.rb | ||
flavours_controller.rb | ||
follower_domains_controller.rb | ||
imports_controller.rb | ||
keyword_mutes_controller.rb | ||
migrations_controller.rb | ||
notifications_controller.rb | ||
preferences_controller.rb | ||
profiles_controller.rb | ||
sessions_controller.rb | ||
two_factor_authentications_controller.rb |