Merge branch 'dev' into beta

pull/748/merge
Marien Fressinaud 10 years ago
commit 78dbc4a714
  1. 2
      CHANGELOG

@ -1,6 +1,6 @@
# Journal des modifications # Journal des modifications
## 2014-12-xx FreshRSS 0.9.3 (beta) ## 2014-12-12 FreshRSS 0.9.3 (beta)
* SimplePie * SimplePie
* Support for content-type application/x-rss+xml * Support for content-type application/x-rss+xml

Loading…
Cancel
Save