merge develop
authorRoman Chvanikov <chvanikoff@pm.me>
Fri, 12 Jul 2019 15:08:27 +0000 (18:08 +0300)
committerRoman Chvanikov <chvanikoff@pm.me>
Fri, 12 Jul 2019 15:08:27 +0000 (18:08 +0300)
commiteae991b06a22bf7fc3eef7a0d5b409c931c1f6cb
tree77cd19ea54b8efa69e45b2d37876e7d5084cf38e
parent371d39e160efa51f2fe608e1788f6b11b89d9839
parentdb75288b71e7531f8e5033f56fc0b9a7d1d8efb3
merge develop
13 files changed:
CHANGELOG.md
config/config.exs
config/test.exs
docs/config.md
lib/mix/tasks/pleroma/instance.ex
lib/pleroma/application.ex
lib/pleroma/user.ex
mix.exs
mix.lock
priv/templates/sample_config.eex
test/support/factory.ex
test/user_search_test.exs
test/user_test.exs