Merge branch 'develop' into issue/2099
authorMaksim Pechnikov <parallel588@gmail.com>
Fri, 18 Sep 2020 04:08:37 +0000 (07:08 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Fri, 18 Sep 2020 04:08:37 +0000 (07:08 +0300)
1  2 
lib/pleroma/web/router.ex

Simple merge