diff options
author | François Schmidts <francois.schmidts@gmail.com> | 2015-03-03 23:30:16 +0100 |
---|---|---|
committer | François Schmidts <francois.schmidts@gmail.com> | 2015-03-03 23:30:16 +0100 |
commit | 41cb78173636e0f6f463280afdf050583dbdb3dc (patch) | |
tree | 42224fe408d3048f210b565413feb34bfe08940c /README.rst | |
parent | last fixes (diff) | |
parent | Typo. (diff) | |
download | newspipe-41cb78173636e0f6f463280afdf050583dbdb3dc.tar.gz newspipe-41cb78173636e0f6f463280afdf050583dbdb3dc.tar.bz2 newspipe-41cb78173636e0f6f463280afdf050583dbdb3dc.zip |
Merge remote-tracking branch 'origin/master' into evol/api
Conflicts:
bootstrap.py
pyaggr3g470r/models.py
pyaggr3g470r/notifications.py
pyaggr3g470r/rest.py
Diffstat (limited to 'README.rst')
-rw-r--r-- | README.rst | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -6,8 +6,7 @@ Presentation ============ `pyAggr3g470r <https://bitbucket.org/cedricbonhomme/pyaggr3g470r>`_ is a -web-based news aggregator. It can be deployed on Heroku or on a -traditional server. +web-based news aggregator. Features ======== @@ -18,7 +17,6 @@ Features * data liberation: export and import all your account with a JSON file; * export and import feeds with OPML files; * export articles to HTML; -* e-mail notification; * favorite articles; * detection of inactive feeds; * share articles with Google +, Pinboard and reddit; |