Merge remote-tracking branch 'upstream/master' into bug/incorrect-theme-dir-order

Synced with upstream
This commit is contained in:
Michael Diodone
2014-10-22 17:05:02 +02:00
2 changed files with 10 additions and 10 deletions

View File

@@ -1,5 +1,5 @@
Jinja2==2.7.1
Markdown==2.3.1
PyYAML==3.10
watchdog==0.7.0
ghp-import==0.4.1
Jinja2>=2.7.1
Markdown>=2.3.1,<2.5
PyYAML>=3.10
watchdog>=0.7.0
ghp-import>=0.4.1

View File

@@ -16,11 +16,11 @@ author = 'Tom Christie'
author_email = 'tom@tomchristie.com'
license = 'BSD'
install_requires = [
'Jinja2==2.7.1',
'Markdown==2.3.1',
'PyYAML==3.10',
'watchdog==0.7.0',
'ghp-import==0.4.1'
'Jinja2>=2.7.1',
'Markdown>=2.3.1,<2.5',
'PyYAML>=3.10',
'watchdog>=0.7.0',
'ghp-import>=0.4.1'
]
long_description = """Work in progress."""