Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Tue, 21 Apr 2020 10:00:33 +0000 (12:00 +0200)
committerlain <lain@soykaf.club>
Tue, 21 Apr 2020 10:00:33 +0000 (12:00 +0200)
commit5165287ff49ff894d2c318fd1138b789a97f9cce
tree97be7133fb193dd1d4647830b60eccb81e93a0fc
parentb5df4a98e4044cf1360f03f7dc3a0b59932ec8f5
parente57c1b60e4a0f882d5217bf1be8b1a7240aa322d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
lib/pleroma/web/router.ex