Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
authorEgor Kislitsyn <egor@kislitsyn.com>
Tue, 7 May 2019 09:51:11 +0000 (16:51 +0700)
committerEgor Kislitsyn <egor@kislitsyn.com>
Tue, 7 May 2019 09:51:11 +0000 (16:51 +0700)
commit1557b99beb3b406572ef2d3baaabed1c9baeca1c
tree34041b8526ecfa38fcb0b471718de0b3b71aa8c4
parentc157e27a000a12dc8f660c056744a6611beb01b1
parent6518644db1d31f2b30b95fa0899b3751bc330d56
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
config/config.exs
lib/pleroma/activity.ex
lib/pleroma/user.ex
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/twitter_api/controllers/util_controller.ex
lib/pleroma/web/twitter_api/twitter_api.ex
test/user_test.exs