Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
authorEgor Kislitsyn <egor@kislitsyn.com>
Mon, 22 Apr 2019 06:08:30 +0000 (13:08 +0700)
committerEgor Kislitsyn <egor@kislitsyn.com>
Mon, 22 Apr 2019 06:08:30 +0000 (13:08 +0700)
commite8c2f9a73a37636a9a8ed5c2998617b841f482da
tree4b194e631d2bbb58b8522c3d74a0b0c2ea09fedd
parent38926a063a39c4d4387049f5d364f72a9f8bd2de
parent7fcbda702e76b6390076c28832f5aea80086d15a
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
config/config.exs
lib/pleroma/activity.ex
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