Merge develop
authorRoman Chvanikov <chvanikoff@gmail.com>
Wed, 8 May 2019 10:08:06 +0000 (17:08 +0700)
committerRoman Chvanikov <chvanikoff@gmail.com>
Wed, 8 May 2019 10:08:06 +0000 (17:08 +0700)
commitb6b5b16ba4d65ecd9812b02d79f844548266eb8b
tree790623e31fed199f04168bcbddb4222a4bfb0a3a
parent0f0cc2703b7ffb99c58e72782925ea4dd61db41d
parent14deed7f7d0b88d5c8ac19bb3de467429c289746
Merge develop
.gitignore
config/config.exs
docs/config.md
lib/pleroma/user.ex
lib/pleroma/user/info.ex
lib/pleroma/web/router.ex
mix.exs
mix.lock
test/support/factory.ex
test/user_test.exs