Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/unfollow...
authordtluna <dtluna@openmailbox.org>
Fri, 28 Apr 2017 13:06:57 +0000 (16:06 +0300)
committerdtluna <dtluna@openmailbox.org>
Fri, 28 Apr 2017 13:06:57 +0000 (16:06 +0300)
commita9b2ad17596d1b6deca646239a95e94dc644ebf3
tree9e086441831f33e191cd62b05b61ece0677491cc
parent28b203d08fe2e0d7afe3f3ec03a16cef62288b23
parentfb5cebc1b5dcfd6af7fa1a81bc5b26275714fa26
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/unfollow-activity
lib/pleroma/user.ex
lib/pleroma/web/twitter_api/twitter_api.ex
test/support/factory.ex