Merge branch 'feature/unfollow-by-screen-name' of ssh.gitgud.io:dtluna/pleroma into...
authordtluna <dtluna@openmailbox.org>
Thu, 20 Apr 2017 07:46:27 +0000 (10:46 +0300)
committerdtluna <dtluna@openmailbox.org>
Thu, 20 Apr 2017 07:46:27 +0000 (10:46 +0300)
commit01901d9835113f35c67cf4c09cbe6530e96f4e79
tree6fd94fa8dbcf090ff321c23f1fbabc945694ed3e
parentd952b6cd7bd54f6d10d4f71e0ffb25b5f0e20582
parentf6547f7b7fa72a9730773012394c522ac6b17398
Merge branch 'feature/unfollow-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