Merge branch 'six' of github.com:ThomasWaldmann/flask into ThomasWaldmann-six

Conflicts:
	flask/testsuite/__init__.py
This commit is contained in:
Daniel Neuhäuser 2013-05-18 18:54:45 +02:00
commit 8494574fdf
13 changed files with 42 additions and 19 deletions

View file

@ -90,6 +90,7 @@ setup(
zip_safe=False,
platforms='any',
install_requires=[
'six>=1.3.0',
'Werkzeug>=0.7',
'Jinja2>=2.4',
'itsdangerous>=0.17'