diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2015-05-16 22:15:33 +0200 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2015-05-16 22:15:33 +0200 |
| commit | 901364ba0ec90e9050552795efe8d1c3571e83c1 (patch) | |
| tree | f19ffff17ba7321f620a5834dd2e4a46ab8ca248 | |
| parent | 6ebfff26139a62a545bd46b05a26af7c509b75f7 (diff) | |
| parent | b3e01b11cf80c728d77cdc70e7014b3899dd415d (diff) | |
Merge remote-tracking branch 'origin/PubSubHubbub' into dev
Conflicts:
CHANGELOG
| -rw-r--r-- | CHANGELOG | 6 | ||||
| -rw-r--r-- | app/i18n/de/sub.php | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,5 +1,11 @@ # Changelog +## 2015-xx-xx FreshRSS 1.1.2 (beta) + +* Features + * Support for PubSubHubbub for instant notifications from compatible Web sites. + + ## 2015-xx-xx FreshRSS 1.1.1 (beta) * Features diff --git a/app/i18n/de/sub.php b/app/i18n/de/sub.php index 7433bd61c..0f05a5635 100644 --- a/app/i18n/de/sub.php +++ b/app/i18n/de/sub.php @@ -37,7 +37,7 @@ return array( 'url' => 'Feed-URL', 'validator' => 'Überprüfen Sie die Gültigkeit des Feeds', 'website' => 'Webseiten-URL', - 'pubsubhubbub' => 'Sofortige Benachrichtigung mit PubSubHubbub', + 'pubsubhubbub' => 'Sofortbenachrichtigung mit PubSubHubbub', ), 'import_export' => array( 'export' => 'Exportieren', |