diff options
| author | Craig Andrews <candrews@integralblue.com> | 2010-02-24 20:52:45 -0500 |
|---|---|---|
| committer | Craig Andrews <candrews@integralblue.com> | 2010-02-24 20:52:45 -0500 |
| commit | c187bf55974347f7ddb4f28714af57861dce8f08 (patch) | |
| tree | 4398b456d88ce79977959b25ba1a0f6fe0c1d77f /plugins/OStatus/extlib/XML/Feed/samples/atom10-example2.xml | |
| parent | 20d6a7caed6636c28cc7b95c584549691dff4388 (diff) | |
| parent | 8914b69d5055c1bc7d0604ee338ffdaf6b0a8606 (diff) | |
Merge branch '0.9.x' into 1.0.x
Conflicts:
EVENTS.txt
db/statusnet.sql
lib/queuemanager.php
Diffstat (limited to 'plugins/OStatus/extlib/XML/Feed/samples/atom10-example2.xml')
| -rwxr-xr-x | plugins/OStatus/extlib/XML/Feed/samples/atom10-example2.xml | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/plugins/OStatus/extlib/XML/Feed/samples/atom10-example2.xml b/plugins/OStatus/extlib/XML/Feed/samples/atom10-example2.xml deleted file mode 100755 index 98abf9d54..000000000 --- a/plugins/OStatus/extlib/XML/Feed/samples/atom10-example2.xml +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - <feed xmlns="http://www.w3.org/2005/Atom"> - <title type="text">dive into mark</title> - <subtitle type="html"> - A <em>lot</em> of effort - went into making this effortless - </subtitle> - <updated>2005-07-31T12:29:29Z</updated> - <id>tag:example.org,2003:3</id> - <link rel="alternate" type="text/html" - hreflang="en" href="http://example.org/"/> - <link rel="self" type="application/atom+xml" - href="http://example.org/feed.atom"/> - <rights>Copyright (c) 2003, Mark Pilgrim</rights> - <generator uri="http://www.example.com/" version="1.0"> - Example Toolkit - </generator> - <entry> - <title>Atom draft-07 snapshot</title> - <link rel="alternate" type="text/html" - href="http://example.org/2005/04/02/atom"/> - <link rel='enclosure' type="audio/mpeg" length="1337" - href="http://example.org/audio/ph34r_my_podcast.mp3"/> - <id>tag:example.org,2003:3.2397</id> - <updated>2005-07-31T12:29:29Z</updated> - <published>2003-12-13T08:29:29-04:00</published> - <author> - <name>Mark Pilgrim</name> - <uri>http://example.org/</uri> - <email>f8dy@example.com</email> - </author> - <contributor> - <name>Sam Ruby</name> - </contributor> - <contributor> - <name>Joe Gregorio</name> - </contributor> - <content type="xhtml" xml:lang="en" - xml:base="http://diveintomark.org/"> - <div xmlns="http://www.w3.org/1999/xhtml"> - <p><i>[Update: The Atom draft is finished.]</i></p> - </div> - </content> - </entry> - </feed>
\ No newline at end of file |