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)
commit72d2b34d3bf47705ad5298f2ce2c6bf48a0a8e82
treedf79362a63e25b87c492c8568e52c029a7ee7542
parent489a107cf449a10c7f6ac9a4b8d4a7f9f7314c5c
parent02f12ec6253093d8bedaf84d78d0f7e533745e1b
Merge branch 'develop' into issue/1975
lib/pleroma/web/router.ex