mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-14 07:05:11 +01:00
16ff7c5627
Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb |
||
---|---|---|
.. | ||
host_meta_controller.rb | ||
keybase_proof_config_controller.rb | ||
nodeinfo_controller.rb | ||
webfinger_controller.rb |