Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/help-test
authordtluna <dtluna@openmailbox.org>
Sun, 16 Apr 2017 10:25:38 +0000 (13:25 +0300)
committerdtluna <dtluna@openmailbox.org>
Sun, 16 Apr 2017 10:25:38 +0000 (13:25 +0300)
commitce1eef9c989f0387168b48f6f61a4c1f84b3f5b5
tree4eaec774a57163ed109a4b8bb11c467dc27ed3c6
parent84c20128100ad5b074720c44a24375b809a0ce09
parentb179b3413e7dbdafbe8a3839ba7719b9eb2a582d
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/help-test
lib/pleroma/web/router.ex
lib/pleroma/web/twitter_api/twitter_api_controller.ex
test/web/twitter_api/twitter_api_controller_test.exs