Merge branch 'release/2.2.0' into 'stable'v2.2.0

Release/2.2.0

See merge request pleroma/secteam/pleroma!19

1 files changed, 0 insertions, 52 deletions

diff --git a/test/fixtures/nil_mention_entry.xml b/test/fixtures/nil_mention_entry.xml
deleted file mode 100644
index e13024cb3..000000000
--- a/test/fixtures/nil_mention_entry.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0" xmlns:georss="http://www.georss.org/georss" xmlns:activity="http://activitystrea.ms/spec/1.0/" xmlns:media="http://purl.org/syndication/atommedia" xmlns:poco="http://portablecontacts.net/spec/1.0" xmlns:ostatus="http://ostatus.org/schema/1.0" xmlns:statusnet="http://status.net/schema/api/1/">
- <generator uri="https://gnu.io/social" version="1.2.0-alpha2">GNU social</generator>
- <id>https://social.stopwatchingus-heidelberg.de/api/statuses/user_timeline/18330.atom</id>
- <title>atarifrosch timeline</title>
- <subtitle>Updates from atarifrosch on social.stopwatchingus-heidelberg.de!</subtitle>
- <logo>https://social.stopwatchingus-heidelberg.de/avatar/18330-96-20150628163706.png</logo>
- <updated>2017-08-24T11:36:49+02:00</updated>
-<author>
- <activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
- <uri>https://social.stopwatchingus-heidelberg.de/user/18330</uri>
- <name>atarifrosch</name>
- <summary>Nerd, Pirat, Debian user, CAcert assurer, Geocacher, Freifunker. Autismus/Depression, agender. GnuPG Key-ID: 0xBCF81ADE</summary>
- <link rel="alternate" type="text/html" href="https://social.stopwatchingus-heidelberg.de/atarifrosch"/>
- <link rel="avatar" type="image/png" media:width="480" media:height="480" href="https://social.stopwatchingus-heidelberg.de/avatar/18330-480-20150628163705.png"/>
- <link rel="avatar" type="image/png" media:width="96" media:height="96" href="https://social.stopwatchingus-heidelberg.de/avatar/18330-96-20150628163706.png"/>
- <link rel="avatar" type="image/png" media:width="48" media:height="48" href="https://social.stopwatchingus-heidelberg.de/avatar/18330-48-20150628163713.png"/>
- <link rel="avatar" type="image/png" media:width="24" media:height="24" href="https://social.stopwatchingus-heidelberg.de/avatar/18330-24-20150628163714.png"/>
- <poco:preferredUsername>atarifrosch</poco:preferredUsername>
- <poco:displayName>Atari-Frosch</poco:displayName>
- <poco:note>Nerd, Pirat, Debian user, CAcert assurer, Geocacher, Freifunker. Autismus/Depression, agender. GnuPG Key-ID: 0xBCF81ADE</poco:note>
- <poco:address>
-  <poco:formatted>Düsseldorf, NRW, Germany</poco:formatted>
- </poco:address>
- <poco:urls>
-  <poco:type>homepage</poco:type>
-  <poco:value>https://www.atari-frosch.de/</poco:value>
-  <poco:primary>true</poco:primary>
- </poco:urls>
- <followers url="https://social.stopwatchingus-heidelberg.de/atarifrosch/subscribers"></followers>
- <statusnet:profile_info local_id="18330"></statusnet:profile_info>
-</author>
-<entry>
- <activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
- <id>tag:social.stopwatchingus-heidelberg.de,2017-08-22:noticeId=978072:objectType=note</id>
- <title>New note by atarifrosch</title>
- <content type="html">2017-08-22 Bundesverfassungsgericht: Erfolgreiche Verfassungsbeschwerde gegen die Versagung vorläufiger Leistungen für Kosten der Unterkunft und Heizung – &lt;a href=&quot;https://www.bundesverfassungsgericht.de/SharedDocs/Pressemitteilungen/DE/2017/bvg17-072.html&quot; title=&quot;https://www.bundesverfassungsgericht.de/SharedDocs/Pressemitteilungen/DE/2017/bvg17-072.html&quot; class=&quot;attachment&quot; id=&quot;attachment-450768&quot; rel=&quot;nofollow external&quot;&gt;https://www.bundesverfassungsgericht.de/SharedDocs/Pressemitteilungen/DE/2017/bvg17-072.html&lt;/a&gt; !&lt;a href=&quot;http://quitter.se/group/2184/id&quot; class=&quot;h-card group&quot; title=&quot;HartzIV (hartziv)&quot;&gt;hartziv&lt;/a&gt;</content>
- <link rel="alternate" type="text/html" href="https://social.stopwatchingus-heidelberg.de/notice/978072"/>
- <status_net notice_id="978072"></status_net>
- <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
- <published>2017-08-22T12:00:21+00:00</published>
- <updated>2017-08-22T12:00:21+00:00</updated>
- <link rel="ostatus:conversation" href="tag:social.stopwatchingus-heidelberg.de,2017-08-22:noticeId=978072:objectType=thread:crc32=28a35f44"/>
- <ostatus:conversation>tag:social.stopwatchingus-heidelberg.de,2017-08-22:noticeId=978072:objectType=thread:crc32=28a35f44</ostatus:conversation>
- <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/person" href=""/>
- <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/group" href="http://quitter.se/group/2184/id"/>
- <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection" href="http://activityschema.org/collection/public"/>
- <link rel="self" type="application/atom+xml" href="https://social.stopwatchingus-heidelberg.de/api/statuses/show/978072.atom"/>
- <link rel="edit" type="application/atom+xml" href="https://social.stopwatchingus-heidelberg.de/api/statuses/show/978072.atom"/>
- <statusnet:notice_info local_id="978072" source="web"></statusnet:notice_info>
-</entry>
-</feed>