Merge branch 'develop' into feature/disable-account
authorEgor Kislitsyn <egor@kislitsyn.com>
Thu, 25 Apr 2019 06:41:10 +0000 (13:41 +0700)
committerEgor Kislitsyn <egor@kislitsyn.com>
Thu, 25 Apr 2019 06:41:10 +0000 (13:41 +0700)
commitc157e27a000a12dc8f660c056744a6611beb01b1
tree36ae4721a1cb92983c7a8fed41b737e0a5a57486
parente8c2f9a73a37636a9a8ed5c2998617b841f482da
parent3789945784a331790d73f69b407751df9f7d6e8f
Merge branch 'develop' into feature/disable-account
config/config.exs
docs/api/pleroma_api.md
lib/pleroma/notification.ex
lib/pleroma/user.ex
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/router.ex
lib/pleroma/web/twitter_api/controllers/util_controller.ex
lib/pleroma/web/twitter_api/twitter_api.ex
test/user_test.exs
test/web/twitter_api/util_controller_test.exs