Merge branch 'bugfix/kroeg' into 'develop'
authorkaniini <nenolod@gmail.com>
Thu, 27 Sep 2018 20:25:35 +0000 (20:25 +0000)
committerkaniini <nenolod@gmail.com>
Thu, 27 Sep 2018 20:25:35 +0000 (20:25 +0000)
commit6258ddaa607c5b103c65c7febbd9d200084ab67a
treebd7e808282eec8489cb55d2db295bcde0de69dd5
parent3de12c194fb32f23c1937af0274756963767ca83
parentc739737998538632f595c03fcedbdb5178ad83b6
Merge branch 'bugfix/kroeg' into 'develop'

More kroeg bugfixes

See merge request pleroma/pleroma!353