Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/user-timeline
authordtluna <dtluna@openmailbox.org>
Sun, 16 Apr 2017 10:32:56 +0000 (13:32 +0300)
committerdtluna <dtluna@openmailbox.org>
Sun, 16 Apr 2017 10:32:56 +0000 (13:32 +0300)
commit7a0046d1271d97d635294ee0cace135d32b141ba
tree0e5d18d2952e7299ddfa093ccf4eb523e8b72c11
parent18cd04ade576969b25e96733dddb8255fbf13a6d
parentb179b3413e7dbdafbe8a3839ba7719b9eb2a582d
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/user-timeline
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/router.ex
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