Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/user-timeline
authordtluna <dtluna@openmailbox.org>
Sun, 16 Apr 2017 14:08:17 +0000 (17:08 +0300)
committerdtluna <dtluna@openmailbox.org>
Sun, 16 Apr 2017 14:08:17 +0000 (17:08 +0300)
commit5229b0194477bea6e513d9e8286956a553133545
treefb1655e5dd1f06e52da676c7c4026a5997cfd206
parent63f04b314d67decefab3a53b43d04b0347adde13
parente158e32124a62f2c93a8910bf3edc4519c4a13e6
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_controller.ex
test/web/twitter_api/twitter_api_test.exs