Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Wed, 29 Apr 2020 11:19:04 +0000 (13:19 +0200)
committerlain <lain@soykaf.club>
Wed, 29 Apr 2020 11:19:04 +0000 (13:19 +0200)
commit0c491b904d126725866087ad9a51fb6346e2a358
tree652f0d122a25f28681ed28445b5087fb56681067
parent30ea6bb1674482ef6ddbfd8744f9bd878eae91e9
parent58fded9858edbeb318dc011cb313e82a86fbafcb
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
lib/pleroma/web/router.ex