Explorar o código

Merge branch 'FreshRSS/dev' into dev

Conflicts:
	CHANGELOG
Alexandre Alapetite %!s(int64=11) %!d(string=hai) anos
pai
achega
6ebfff2613
Modificáronse 1 ficheiros con 0 adicións e 1 borrados
  1. 0 1
      CHANGELOG

+ 0 - 1
CHANGELOG

@@ -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.