Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/help-test
authordtluna <dtluna@openmailbox.org>
Sun, 16 Apr 2017 14:10:25 +0000 (17:10 +0300)
committerdtluna <dtluna@openmailbox.org>
Sun, 16 Apr 2017 14:10:25 +0000 (17:10 +0300)
commit85bd480be333896ca9cc0ade0e68ea99e10aaaa7
treeaa545ad989ae70367aff25e1dfe970f28e88e55a
parentce1eef9c989f0387168b48f6f61a4c1f84b3f5b5
parente158e32124a62f2c93a8910bf3edc4519c4a13e6
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