Merge branch 'feature/relay' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Mon, 27 Aug 2018 08:29:25 +0000 (08:29 +0000)
committerlambda <pleromagit@rogerbraun.net>
Mon, 27 Aug 2018 08:29:25 +0000 (08:29 +0000)
commit46c7c2380c9f923b6c9e1521b025fd45aed0ae37
treeb68eb17204a86f61dba574ad7376a4891dd262b6
parent440b459cd14778e155cd6a3550847b1277fbd1f1
parent0f5bff8c66fa2b67633fe05de8aaa1985f4d98f8
Merge branch 'feature/relay' into 'develop'

message relay

Closes #144

See merge request pleroma/pleroma!264
lib/pleroma/user.ex
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/views/user_view.ex
lib/pleroma/web/router.ex