Merge develop
authorRoman Chvanikov <chvanikoff@pm.me>
Tue, 9 Jul 2019 18:21:09 +0000 (21:21 +0300)
committerRoman Chvanikov <chvanikoff@pm.me>
Tue, 9 Jul 2019 18:21:09 +0000 (21:21 +0300)
commit371d39e160efa51f2fe608e1788f6b11b89d9839
treeb5dc6280d713f11392fd47bffd1a675b527162f5
parentd2cb18b2a342b990cc47dfdc42adb843c3db1b5e
parent670a77ecbc94d57c6ecb5e569597e81cee4b5532
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
lib/pleroma/web/router.ex
mix.exs
mix.lock
priv/templates/sample_config.eex
test/user_search_test.exs
test/user_test.exs