Merge branch 'develop' into feature/masto_api_markers
authorMaksim Pechnikov <parallel588@gmail.com>
Mon, 21 Oct 2019 08:32:28 +0000 (11:32 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Mon, 21 Oct 2019 08:32:28 +0000 (11:32 +0300)
commit243719a96584901c560d75333c79b056c5a5c395
treefd5390210264a0b21b255a1d73d61dc2ce2304cd
parent66b5d0ff558bffeddf6475af72b73bf2870512f6
parent2ebe8c416a72b512feaba87040982da5bcf865cf
Merge branch 'develop' into feature/masto_api_markers
lib/pleroma/web/router.ex
test/support/factory.ex