Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature...
authorAlexander Strizhakov <alex.strizhakov@gmail.com>
Mon, 6 May 2019 16:45:22 +0000 (16:45 +0000)
committerlambda <lain@soykaf.club>
Mon, 6 May 2019 16:45:22 +0000 (16:45 +0000)
commitce6ca0fefe7feb1c31447287aec117d40233652a
tree6284b81c9cc888bae9159d76dab7aab6f0e57661
parentd089ff24600455fefc17e91807c61ddc61ba107a
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion
CHANGELOG.md
config/config.exs
docs/config.md
lib/mix/tasks/pleroma/user.ex
lib/pleroma/activity.ex
lib/pleroma/user.ex
lib/pleroma/user_invite_token.ex
lib/pleroma/web/twitter_api/controllers/util_controller.ex
test/user_test.exs