Merge branch 'feature/follow-by-screen-name' of ssh.gitgud.io:dtluna/pleroma into...
authordtluna <dtluna@openmailbox.org>
Thu, 20 Apr 2017 07:39:18 +0000 (10:39 +0300)
committerdtluna <dtluna@openmailbox.org>
Thu, 20 Apr 2017 07:39:18 +0000 (10:39 +0300)
commitd952b6cd7bd54f6d10d4f71e0ffb25b5f0e20582
treed02067e6cb7efcdb3913e11c542f527093f4555d
parenteda742c78b0087033ee96f27c13dbdc00741cf87
parent369be708b2126e15fd870977810b3e71514d9979
Merge branch 'feature/follow-by-screen-name' of ssh.gitgud.io:dtluna/pleroma into feature/follow-unfollow-by-screen-name
lib/pleroma/web/twitter_api/twitter_api.ex
lib/pleroma/web/twitter_api/twitter_api_controller.ex
test/web/twitter_api/twitter_api_test.exs