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)
1  2 
lib/pleroma/web/router.ex

Simple merge