mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-22 06:43:19 +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 |
||
---|---|---|
.. | ||
account_moderation_notes_controller.rb | ||
accounts_controller.rb | ||
action_logs_controller.rb | ||
base_controller.rb | ||
confirmations_controller.rb | ||
custom_emojis_controller.rb | ||
domain_blocks_controller.rb | ||
email_domain_blocks_controller.rb | ||
instances_controller.rb | ||
invites_controller.rb | ||
reported_statuses_controller.rb | ||
reports_controller.rb | ||
resets_controller.rb | ||
roles_controller.rb | ||
settings_controller.rb | ||
silences_controller.rb | ||
statuses_controller.rb | ||
subscriptions_controller.rb | ||
suspensions_controller.rb | ||
two_factor_authentications_controller.rb |