Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/follow...
authordtluna <dtluna@openmailbox.org>
Fri, 21 Apr 2017 15:36:03 +0000 (18:36 +0300)
committerdtluna <dtluna@openmailbox.org>
Fri, 21 Apr 2017 15:36:03 +0000 (18:36 +0300)
commita9b3f99d48a430b4810662113e2118a68c49af4d
treec65c95156ef75ac48702055d7f2f0e80cd641bc1
parentb248fc7dfb8c0d3b42a75225d4ad5489c51b5103
parent9afc672009ac49075530f44aefd73a17a0c50d43
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/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