Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
authorEgor Kislitsyn <egor@kislitsyn.com>
Tue, 14 May 2019 11:15:56 +0000 (18:15 +0700)
committerEgor Kislitsyn <egor@kislitsyn.com>
Tue, 14 May 2019 11:15:56 +0000 (18:15 +0700)
commit5e2b491276d5cd8d90fddf219f7653d1c9b31ef3
treec7d10c01a9b17ba9c732cb43e2097bd26d67e915
parent1557b99beb3b406572ef2d3baaabed1c9baeca1c
parentcdcdbd88da76f18c21da7f6f15a29883044902c8
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
config/config.exs
lib/pleroma/activity.ex
lib/pleroma/user.ex
lib/pleroma/user/query.ex
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/router.ex
lib/pleroma/web/twitter_api/twitter_api.ex
test/user_test.exs