Merge conflict in requirements.
This commit is contained in:
commit
8e1ad97ec1
|
@ -1,15 +1,10 @@
|
||||||
requests
|
requests
|
||||||
twisted
|
twisted
|
||||||
flask
|
flask
|
||||||
Flask-SQLAlchemy
|
|
||||||
flask-admin
|
flask-admin
|
||||||
flask-openid
|
flask-openid
|
||||||
werkzeug==0.8.3
|
flask-login
|
||||||
flask==0.9
|
|
||||||
Flask-Login==0.1.3
|
|
||||||
# as per http://stackoverflow.com/questions/17092849/flask-login-typeerror-decoding-unicode-is-not-supported/17098415#17098415
|
|
||||||
flask-sqlalchemy
|
flask-sqlalchemy
|
||||||
flask-security
|
flask-security
|
||||||
git+https://github.com/tobiasandtobias/flask-alembic.git#egg=flask-alembic
|
git+git://github.com/tobiasandtobias/flask-alembic.git#egg=flask-alembic
|
||||||
psycopg2
|
|
||||||
gunicorn
|
gunicorn
|
Loading…
Reference in New Issue