Merge remote-tracking branch 'origin/develop' into matrixmatrix

1 files changed, 0 insertions, 39 deletions

diff --git a/test/fixtures/mastodon-note-cw.xml b/test/fixtures/mastodon-note-cw.xml
deleted file mode 100644
index 02f49dd61..000000000
--- a/test/fixtures/mastodon-note-cw.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-<feed xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0" xmlns:activity="http://activitystrea.ms/spec/1.0/" xmlns:poco="http://portablecontacts.net/spec/1.0" xmlns:media="http://purl.org/syndication/atommedia" xmlns:ostatus="http://ostatus.org/schema/1.0" xmlns:mastodon="http://mastodon.social/schema/1.0">
-  <id>https://mastodon.social/users/lambadalambda.atom</id>
-  <title>Critical Value</title>
-  <subtitle></subtitle>
-  <updated>2017-04-16T21:47:25Z</updated>
-  <logo>https://files.mastodon.social/accounts/avatars/000/000/264/original/1429214160519.gif</logo>
-  <author>
-    <id>https://mastodon.social/users/lambadalambda</id>
-    <activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
-    <uri>https://mastodon.social/users/lambadalambda</uri>
-    <name>lambadalambda</name>
-    <email>lambadalambda@mastodon.social</email>
-    <link rel="alternate" type="text/html" href="https://mastodon.social/@lambadalambda"/>
-    <link rel="avatar" type="image/gif" media:width="120" media:height="120" href="https://files.mastodon.social/accounts/avatars/000/000/264/original/1429214160519.gif"/>
-    <link rel="header" type="" media:width="700" media:height="335" href="/headers/original/missing.png"/>
-    <poco:preferredUsername>lambadalambda</poco:preferredUsername>
-    <poco:displayName>Critical Value</poco:displayName>
-    <mastodon:scope>public</mastodon:scope>
-  </author>
-  <link rel="alternate" type="text/html" href="https://mastodon.social/@lambadalambda"/>
-  <link rel="self" type="application/atom+xml" href="https://mastodon.social/users/lambadalambda.atom"/>
-  <link rel="hub" href="https://mastodon.social/api/push"/>
-  <link rel="salmon" href="https://mastodon.social/api/salmon/264"/>
-  <entry>
-    <id>tag:mastodon.social,2017-05-10:objectId=5551985:objectType=Status</id>
-    <published>2017-05-10T12:21:36Z</published>
-    <updated>2017-05-10T12:21:36Z</updated>
-    <title>New status by lambadalambda</title>
-    <activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
-    <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
-    <summary xml:lang="sv">technologic</summary>
-    <content type="html" xml:lang="sv">&lt;p&gt;test&lt;/p&gt;</content>
-    <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection" href="http://activityschema.org/collection/public"/>
-    <mastodon:scope>public</mastodon:scope>
-    <link rel="alternate" type="text/html" href="https://mastodon.social/users/lambadalambda/updates/2314748"/>
-    <link rel="self" type="application/atom+xml" href="https://mastodon.social/users/lambadalambda/updates/2314748.atom"/>
-  </entry>
-</feed>