Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/help-test
authordtluna <dtluna@openmailbox.org>
Thu, 13 Apr 2017 12:15:09 +0000 (15:15 +0300)
committerdtluna <dtluna@openmailbox.org>
Thu, 13 Apr 2017 12:15:09 +0000 (15:15 +0300)
commit84c20128100ad5b074720c44a24375b809a0ce09
treee7c7a935c7dfac3363e9d162479c22e2ceea471d
parent59a406d94cbb1df2f3c7b6b7844f1141cc661f7c
parentd2bf099ae66b7332128c854f322bb8a00eb62212
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