diff options
author | François Schmidts <francois.schmidts@gmail.com> | 2015-04-06 10:37:13 +0200 |
---|---|---|
committer | François Schmidts <francois.schmidts@gmail.com> | 2015-04-06 10:37:13 +0200 |
commit | 29bb2a36f0b5d1781ab05f1976aa0c5017351807 (patch) | |
tree | 52b2dd87f4d36f6a9c518cc14f96e523b1dea045 /requirements.txt | |
parent | misc update (diff) | |
parent | Minor changes to the CSS. (diff) | |
download | newspipe-29bb2a36f0b5d1781ab05f1976aa0c5017351807.tar.gz newspipe-29bb2a36f0b5d1781ab05f1976aa0c5017351807.tar.bz2 newspipe-29bb2a36f0b5d1781ab05f1976aa0c5017351807.zip |
Merge remote-tracking branch 'upstream/master'
Conflicts:
pyaggr3g470r/controllers/feed.py
pyaggr3g470r/templates/home.html
Diffstat (limited to 'requirements.txt')
-rw-r--r-- | requirements.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/requirements.txt b/requirements.txt index 3469aef9..8dc23d8a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,14 @@ aiohttp -feedparser -opml requests +requests-futures +feedparser beautifulsoup4 lxml +opml +psycopg2 SQLAlchemy +alembic +whoosh Flask Flask-SQLAlchemy Flask-Login @@ -14,11 +18,7 @@ Flask-RESTful Flask-Babel Flask-SSLify Flask-Migrate -flask-Script +Flask-Script WTForms python-postmark -whoosh python-dateutil -alembic -requests-futures==0.9.5 -psycopg2 |