Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
authorIvan Tashkinov <ivantashkinov@gmail.com>
Wed, 4 Nov 2020 14:48:10 +0000 (17:48 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Wed, 4 Nov 2020 14:48:10 +0000 (17:48 +0300)
1  2 
lib/pleroma/web/router.ex

Simple merge