Merge branch 'develop' into feature/activitypub
authorlain <lain@soykaf.club>
Mon, 12 Feb 2018 09:24:15 +0000 (10:24 +0100)
committerlain <lain@soykaf.club>
Mon, 12 Feb 2018 09:24:15 +0000 (10:24 +0100)
commitb331cb449a46bbead19fea4fba59762c1a2e3a10
tree5ce081e6f6b6b6305ec8a280adb53a64fd08a941
parent8cf97ee8e15a36cbbf0964d5be53c88d29798163
parent1bc34de4dfef5336d0dc165495ac66de2ffef2c6
Merge branch 'develop' into feature/activitypub
lib/pleroma/web/ostatus/ostatus_controller.ex
test/user_test.exs
test/web/activity_pub/activity_pub_test.exs