Merge branch 'fix/oauth-controller' into 'develop'
authorlain <lain@soykaf.club>
Fri, 4 Oct 2019 11:27:30 +0000 (11:27 +0000)
committerlain <lain@soykaf.club>
Fri, 4 Oct 2019 11:27:30 +0000 (11:27 +0000)
commitbc095a27f10047e3620d1e665d29aa7b7a91a584
treebf268bd7260d59b25179fef073db290f1e28bcf1
parentbdf188b2a68992e8e30379d75e367eadebb07e36
parentd3ac4e8083f254a6a0e329a5807c0973f55402f4
Merge branch 'fix/oauth-controller' into 'develop'

Fix OAuthController

Closes #1294

See merge request pleroma/pleroma!1780