Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/unfollow...
authordtluna <dtluna@openmailbox.org>
Sun, 16 Apr 2017 10:28:23 +0000 (13:28 +0300)
committerdtluna <dtluna@openmailbox.org>
Sun, 16 Apr 2017 10:28:23 +0000 (13:28 +0300)
commit9a8c348aed7772c9e2173163687e63943cf491fb
treefa1317a374e309e667beabd240c41003e2f6fdbb
parentc0e5b3459fa7c53abf6969584b3298184e0094bd
parentb179b3413e7dbdafbe8a3839ba7719b9eb2a582d
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/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