Permalink
Browse files

Merge branch 'release/0.4.3'

  • Loading branch information...
klen committed Sep 1, 2012
2 parents e4bff0e + 8436435 commit b6ac8abb827f9f285a00e97c2a8f2c0e4c2a9fcd
Showing with 9 additions and 5 deletions.
  1. +4 −0 Changelog
  2. +1 −1 base/auth/script.py
  3. +3 −3 base/ext.py
  4. +1 −1 requirements.txt
View
@@ -1,3 +1,7 @@
+2012-09-01 klen
+
+ * Flask-Script>=0.4.0
+
2012-08-29 klen
* Flask-Cache>=0.7.1
View
@@ -1,4 +1,4 @@
-from flaskext.script import Command, Option, prompt_pass
+from flask_script import Command, Option, prompt_pass
from ..ext import manager
View
@@ -1,11 +1,11 @@
from flask import request
+from flask_collect import Collect
+from flask_debugtoolbar import DebugToolbarExtension
+from flask_script import Manager
from flask_sqlalchemy import SQLAlchemy
from flaskext.babel import Babel
from flaskext.cache import Cache
from flaskext.mail import Mail
-from flaskext.script import Manager
-from flask_collect import Collect
-from flask_debugtoolbar import DebugToolbarExtension
from .app import create_app
View
@@ -3,7 +3,7 @@
Flask>=0.9
Flask-SQLAlchemy>=0.16
Flask-Cache>=0.7.1
-Flask-Script>=0.3.3
+Flask-Script>=0.4.0
Flask-Admin>=1.0.2
Flask-Babel>=0.8
Flask-Bootstrap>=2.1.0-1

0 comments on commit b6ac8ab

Please sign in to comment.