Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/unfollow...
authordtluna <dtluna@openmailbox.org>
Sun, 16 Apr 2017 14:13:42 +0000 (17:13 +0300)
committerdtluna <dtluna@openmailbox.org>
Sun, 16 Apr 2017 14:13:42 +0000 (17:13 +0300)
commitf6547f7b7fa72a9730773012394c522ac6b17398
treebe5af86ddc8c353cdc90e1bfac67bbc1f66f9b1c
parent9a8c348aed7772c9e2173163687e63943cf491fb
parente158e32124a62f2c93a8910bf3edc4519c4a13e6
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/unfollow-by-screen-name
lib/pleroma/web/twitter_api/twitter_api_controller.ex
test/web/twitter_api/twitter_api_test.exs