Merge branch 'develop' into feature/activitypub
authorlain <lain@soykaf.club>
Thu, 8 Mar 2018 11:37:06 +0000 (12:37 +0100)
committerlain <lain@soykaf.club>
Thu, 8 Mar 2018 11:37:06 +0000 (12:37 +0100)
commit611ca385dea3d611a97579000311cc42684305e6
treef56c298bed6b289aa2dd81766862265ccef05947
parent8228ae96d87fa9a8dc6c2603767ab8f094703e9e
parent0f2bf3eefb0adba13a3f3d37e8d8b1bd414a33e4
Merge branch 'develop' into feature/activitypub
config/config.exs
lib/pleroma/user.ex
lib/pleroma/web/federator/federator.ex
lib/pleroma/web/router.ex
test/user_test.exs