Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/follow...
authordtluna <dtluna@openmailbox.org>
Thu, 13 Apr 2017 12:18:18 +0000 (15:18 +0300)
committerdtluna <dtluna@openmailbox.org>
Thu, 13 Apr 2017 12:18:18 +0000 (15:18 +0300)
commit3ff917b5dd72bc44f84a8f08cfc368faf28199f0
tree2bb558af2ee2a8b4ad23211f8f3ad5d7ca8a5421
parent896e40cd2bbd064548a1a9cb730f79d793e6d6f5
parentd2bf099ae66b7332128c854f322bb8a00eb62212
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