Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Mon, 8 Jun 2020 08:18:10 +0000 (10:18 +0200)
committerlain <lain@soykaf.club>
Mon, 8 Jun 2020 08:18:10 +0000 (10:18 +0200)
commit7d66dd180ac98ab9b16463d2d71ab292f8fe07a0
treecf0a0210b57630d8de23a7f774ceec600daaa934
parent1a2acce7c5927cd113ebcffd0acc7a5c547bbf0e
parentd74985af2381b1c0dae2bc9c79c14582e5c61b97
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
lib/pleroma/web/router.ex