Merge branch 'user_info_fixes_again' into 'develop'
authorHaelwenn <git.pleroma.social@hacktivis.me>
Sun, 2 Dec 2018 23:07:24 +0000 (23:07 +0000)
committerHaelwenn <git.pleroma.social@hacktivis.me>
Sun, 2 Dec 2018 23:07:24 +0000 (23:07 +0000)
commite1204c6f25526470e410bb34595ec1e7b3502371
treeed5c4cb8abc477f11d4c4194b5db26b7bc877f68
parent371d96b1da85960dafea9665b8bc32ba553b1555
parente3f3d13d994e2b65d796818ee424b854f83c1223
Merge branch 'user_info_fixes_again' into 'develop'

User info fixes again

See merge request pleroma/pleroma!489