Merge branch 'FreshRSS/dev' into dev

Conflicts: CHANGELOG
10 years ago · 6ebfff2613
parent 96dab23f2a a19e908b73
commit 6ebfff2613
1 changed files with 0 additions and 1 deletions
--- a/1
+++ b/1
@ -3,7 +3,6 @@
 ## 2015-xx-xx FreshRSS 1.1.1 (beta)

 * Features
-	* Support for PubSubHubbub for instant notifications from compatible Web sites.
 	* New option to detect and mark updated articles as unread.
 	* Support for internationalized domain name (IDN).
 * Misc.