Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
authorIvan Tashkinov <ivantashkinov@gmail.com>
Sat, 21 Nov 2020 16:47:46 +0000 (19:47 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Sat, 21 Nov 2020 16:47:46 +0000 (19:47 +0300)
commit489b12cde48d0ed6b16914c5a831b1e992d0d059
tree2928b5b9111339f16a5642c4ec07c82851c4f7ed
parentccc2cf0e87f47618163da588ead76846c64cba7a
parentecd1ef8cb5afa16dba5158e9e278a18c0856ca3e
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
docs/dev.md
lib/pleroma/web/router.ex