Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Thu, 21 May 2020 13:35:13 +0000 (15:35 +0200)
committerlain <lain@soykaf.club>
Thu, 21 May 2020 13:35:13 +0000 (15:35 +0200)
commit578ed3a37f28ecbd9fd976c54ee53e8ed2a6adff
tree9eb3e3d2a5731378567a940321100efcb3f1bd7c
parentc4a5cead51770f0d54cb77805b7e2bd705f251d9
parenta42a0716ec769dfbd97505b6c872c5ea1a8f800a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
lib/pleroma/web/router.ex