Merge remote-tracking branch 'origin/PubSubHubbub' into dev

Conflicts: CHANGELOG
10 years ago · 901364ba0e
parent 6ebfff2613 b3e01b11cf
commit 901364ba0e
2 changed files with 7 additions and 1 deletions
--- a/6
+++ b/6
@ -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
--- 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',