Merge branch 'develop' into kaniini/pleroma-feature/activitypub-endpoints
authorlain <lain@soykaf.club>
Thu, 22 Mar 2018 11:48:56 +0000 (12:48 +0100)
committerlain <lain@soykaf.club>
Thu, 22 Mar 2018 11:48:56 +0000 (12:48 +0100)
1  2 
lib/pleroma/web/router.ex

Simple merge