Skip to content

Commit

Permalink
Merge branch 'master' into pyup-pin-flask-sqlalchemy-2.3.2
Browse files Browse the repository at this point in the history
  • Loading branch information
jace authored Jun 18, 2018
2 parents 0cb44c1 + 3506beb commit 6ab4ac8
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
10 changes: 5 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Flask
Flask-Assets
Flask-Mail
Flask==1.0.2
Flask-Assets==0.12
Flask-Mail==0.9.1
Flask-SQLAlchemy==2.3.2
Flask-WTF
pytz
Expand All @@ -12,5 +12,5 @@ git+https://github.com/hasgeek/baseframe.git
alembic
qrcode
rq
psycopg2
Flask-Migrate
psycopg2==2.7.5
Flask-Migrate==2.2.0
6 changes: 3 additions & 3 deletions test_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
nose
coverage
coveralls
nose==1.3.7
coverage==4.5.1
coveralls==1.3.0

0 comments on commit 6ab4ac8

Please sign in to comment.