Merge develop
authorRoman Chvanikov <chvanikoff@pm.me>
Fri, 19 Jul 2019 22:03:25 +0000 (01:03 +0300)
committerRoman Chvanikov <chvanikoff@pm.me>
Fri, 19 Jul 2019 22:03:25 +0000 (01:03 +0300)
commit36049f08efadb5f6f727753ecc1f7be6a5b4e3d8
tree2f1e1b5a20ad654cda4021115e621887d2735959
parente7c175c943e9e3f53df76d812c09cfeffdb1c56b
parent33729bbb2834bfa1f223b11d47dc8e3230d47657
Merge develop
CHANGELOG.md
config/config.exs
config/test.exs
docs/config.md
lib/pleroma/application.ex
lib/pleroma/user.ex
lib/pleroma/web/router.ex
mix.exs
mix.lock
test/user_test.exs