Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Mon, 5 Oct 2020 20:50:08 +0000 (23:50 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Mon, 5 Oct 2020 20:50:08 +0000 (23:50 +0300)
commit6c2264af24e70e8279508e0166350e8034e139e4
tree1fce808270f82b8a7e5fe38e94b672c8bf7d8a59
parent094edde7c4ddf65f46e5d692a5ef5b859587d1e1
parent4d852f3e78d6fcfe7bb2ef8b8d3a2f29359dd20c
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
lib/pleroma/web/router.ex