Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into bugfix/repeated...
authordtluna <dtluna@openmailbox.org>
Thu, 13 Apr 2017 12:36:00 +0000 (15:36 +0300)
committerdtluna <dtluna@openmailbox.org>
Thu, 13 Apr 2017 12:36:00 +0000 (15:36 +0300)
commita8e50d602ba25b2062e0e676e1dd115da64c2565
tree4921704448e03286876255b0aa0b46badf58e586
parent65ef18a7157f8cfcc494ad7a72ce083e79e38d26
parentd2bf099ae66b7332128c854f322bb8a00eb62212
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into bugfix/repeated-follow-unfollow
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