Merge branch 'fix/sign-in-with-toot' into 'develop'
authorHaelwenn <git.pleroma.social@hacktivis.me>
Wed, 5 Sep 2018 18:20:26 +0000 (18:20 +0000)
committerHaelwenn <git.pleroma.social@hacktivis.me>
Wed, 5 Sep 2018 18:20:26 +0000 (18:20 +0000)
commit4a3dbd9d4e052969460bad19dfc535908027ed03
treee841dc3855900bf6e89d316039ba7cdcdb3be2b8
parent8143251f06b1a781ee20924c89be484e514f0bec
parent84d84e4ca49c02180828d65d95b841953ed04ef0
Merge branch 'fix/sign-in-with-toot' into 'develop'

Fix sign-in and sign-out with Toot!

See merge request pleroma/pleroma!306
lib/pleroma/web/mastodon_api/views/account_view.ex
lib/pleroma/web/router.ex
test/web/mastodon_api/account_view_test.exs