Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
authorEgor Kislitsyn <egor@kislitsyn.com>
Thu, 11 Apr 2019 08:51:52 +0000 (15:51 +0700)
committerEgor Kislitsyn <egor@kislitsyn.com>
Thu, 11 Apr 2019 08:51:52 +0000 (15:51 +0700)
commit0f2f7d2cec8297b1b5645643d7584cde561ce628
treeaa618de9dc399de2e3abf37ad9ecf66d8cb9761f
parent22ac2288be498bd6a5a6fefe2dc6d2e260a8dc39
parente5d553aa45ffa218b0695d7976f012bfc1dcbafe
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
config/config.exs
lib/mix/tasks/pleroma/user.ex
lib/pleroma/activity.ex
lib/pleroma/notification.ex
lib/pleroma/user.ex
lib/pleroma/user/info.ex
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/admin_api/admin_api_controller.ex
lib/pleroma/web/router.ex
lib/pleroma/web/twitter_api/controllers/util_controller.ex
lib/pleroma/web/twitter_api/twitter_api.ex