Merge branch 'develop' into issue/1975
authorMaksim Pechnikov <parallel588@gmail.com>
Tue, 22 Sep 2020 18:42:10 +0000 (21:42 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Tue, 22 Sep 2020 18:42:10 +0000 (21:42 +0300)
1  2 
lib/pleroma/web/router.ex

Simple merge