Merge develop
authorRoman Chvanikov <chvanikoff@gmail.com>
Wed, 29 May 2019 15:18:22 +0000 (18:18 +0300)
committerRoman Chvanikov <chvanikoff@gmail.com>
Wed, 29 May 2019 15:18:22 +0000 (18:18 +0300)
commitce47017c8927b8b2d31668d5e32e387d80739502
treebe77acd4dc0c6b9d7b6cb8515470e1dae3212aa7
parentf1f7a11222f4689f000825147d16b366d915f393
parent57e58d26029388a5831cd2ac3fbc419c27c4d7c6
Merge develop
config/config.exs
docs/config.md
lib/pleroma/application.ex
lib/pleroma/notification.ex
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