Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/follow...
authordtluna <dtluna@openmailbox.org>
Sun, 16 Apr 2017 14:12:28 +0000 (17:12 +0300)
committerdtluna <dtluna@openmailbox.org>
Sun, 16 Apr 2017 14:12:28 +0000 (17:12 +0300)
commit82914e1e4de37747653c83644b428c1ba29428c9
tree0688c91826f16ba428a9cea7a25a74ed2ae19e1d
parent594dd01ab2864482d8c1cdb0153d7b4b0972b3b4
parente158e32124a62f2c93a8910bf3edc4519c4a13e6
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/follow-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