mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-04 12:34:32 +00:00
5cadb47238
Conflicts: - app/controllers/auth/sessions_controller.rb Minor conflict due to glitch-soc's theming code |
||
---|---|---|
.. | ||
host_meta_controller.rb | ||
keybase_proof_config_controller.rb | ||
webfinger_controller.rb |