Merge branch 'fix/tusk' into 'develop'
authorkaniini <nenolod@gmail.com>
Fri, 7 Sep 2018 23:47:43 +0000 (23:47 +0000)
committerkaniini <nenolod@gmail.com>
Fri, 7 Sep 2018 23:47:43 +0000 (23:47 +0000)
commit14a762a213db0d00550c1421651ef689249c9c57
tree43f1a7520301af2ac1d90efd4dd01dbe0c9043bf
parent403f9d118dadcef806044831221d5c67800ce34d
parentc1d07da4e18cc2acd11a5a131e1482aec5996552
Merge branch 'fix/tusk' into 'develop'

Fix signin and initial loading with Tusk

See merge request pleroma/pleroma!333