diff options
| author | Art4 <[email protected]> | 2015-02-19 23:17:43 +0100 |
|---|---|---|
| committer | Art4 <[email protected]> | 2015-02-19 23:17:43 +0100 |
| commit | d9c042c4c536f1afbf206aeea09b0b127b7b6418 (patch) | |
| tree | 9d7ef18c6d9d4c8f8f4d1c9a5dbfceeb9fd5acf4 /classes/feedparser.php | |
| parent | cf42b79120290ee5866136a0c4656e6999f06045 (diff) | |
| parent | 4ca621a36016de1fbb5447e1c1de0b607ba94a7c (diff) | |
Merge branch 'master' into patch-1
Conflicts:
locale/de_DE/LC_MESSAGES/messages.po
Diffstat (limited to 'classes/feedparser.php')
| -rw-r--r-- | classes/feedparser.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/classes/feedparser.php b/classes/feedparser.php index 239fdb7a6..30af6f62e 100644 --- a/classes/feedparser.php +++ b/classes/feedparser.php @@ -115,6 +115,7 @@ class FeedParser { $this->type = $this::FEED_RSS; break; case "feed": + case "atom:feed": $this->type = $this::FEED_ATOM; break; default: |