Merge branch 'develop' into feature/configurable-blocks
authorsquidboi <squidboi@waifu.club>
Sat, 16 Jun 2018 22:37:16 +0000 (15:37 -0700)
committersquidboi <squidboi@waifu.club>
Sat, 16 Jun 2018 22:37:16 +0000 (15:37 -0700)
commit2e294ee44a1baa7c0d3ac6b2905a70ed4e05cffb
tree740d660abc0ca455368144abc89c8a398e85caf0
parent4f9ecfc77a54eef23741c89206b4cbce924f7d76
parent1ea4a18ad859600841860cdd1a981da868aa18a0
Merge branch 'develop' into feature/configurable-blocks
config/config.exs
lib/pleroma/user.ex
lib/pleroma/web/activity_pub/activity_pub.ex