Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into bugfix/repeated...
authordtluna <dtluna@openmailbox.org>
Sun, 16 Apr 2017 14:18:34 +0000 (17:18 +0300)
committerdtluna <dtluna@openmailbox.org>
Sun, 16 Apr 2017 14:18:34 +0000 (17:18 +0300)
commitef5033d7a7f744607235e974c7beb96b014c2b61
treeb885af1dedf3978ad265cf769713915d04510d0f
parenta8e50d602ba25b2062e0e676e1dd115da64c2565
parente158e32124a62f2c93a8910bf3edc4519c4a13e6
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into bugfix/repeated-follow-unfollow
lib/pleroma/user.ex
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