Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
authorIvan Tashkinov <ivantashkinov@gmail.com>
Wed, 25 Nov 2020 18:48:18 +0000 (21:48 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Wed, 25 Nov 2020 18:48:18 +0000 (21:48 +0300)
commit62993db499ca565cdb0a404f9668528971adf9dd
tree82aed196eee45e09e36b500b948235674d817530
parent12a5981cc3da65b7f2763d0ec05871b0986234f5
parent7a8be68241c9872a4271b53c30ebdc34f9ecf41d
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
test/pleroma/web/o_auth/o_auth_controller_test.exs