Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
authorRoger Braun <roger@rogerbraun.net>
Thu, 1 Jun 2017 09:24:03 +0000 (11:24 +0200)
committerRoger Braun <roger@rogerbraun.net>
Thu, 1 Jun 2017 09:24:03 +0000 (11:24 +0200)
commitc7fdd1b7ff6e7a08389395d555862eaec9721b08
tree2eacd5f670c35fa834399636a0cc5c8de53ba054
parent87c2c42badd7d8cd1f36e979eae923725f27bbe7
parent4cfe1e0c9becebbc5665eb28b187451f96c73555
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
lib/pleroma/web/ostatus/activity_representer.ex
lib/pleroma/web/ostatus/ostatus.ex
lib/pleroma/web/twitter_api/utils.ex
test/web/ostatus/activity_representer_test.exs