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)
commitb72a25f5b1ce18698b1b3aff6487157898dc7846
tree79b97d7f89842ef1d28a334d829e84b1d0c7f429
parent3fcdfb75d03efa27903ba5fdd5c78f2b93a4d55b
parent32ae9188430349e22721b81baec825b3cebfe8e5
Merge branch 'develop' into kaniini/pleroma-feature/activitypub-endpoints
lib/pleroma/web/router.ex