Merge branch 'develop' into issue/2099
authorMaksim Pechnikov <parallel588@gmail.com>
Fri, 18 Sep 2020 19:13:05 +0000 (22:13 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Fri, 18 Sep 2020 19:13:05 +0000 (22:13 +0300)
commited3bc53fa137ec4652606cad1df5783c47afb830
treeab05f72720d2118b6f22b159c80bf5de4961d7ce
parent2159daa9af8967fe4b6d31e19c7048979b4cb165
parent6c052bd5b6cc29d321b500654bd6b098d0e6c56a
Merge branch 'develop' into issue/2099
CHANGELOG.md
lib/pleroma/user.ex
lib/pleroma/web/router.ex