aboutsummaryrefslogtreecommitdiffstats
path: root/setup.py
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2013-06-22 16:13:41 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2013-06-22 16:13:41 -0500
commit257b8ab62a6a5e04d60575a9766e5ed3503a15ed (patch)
tree5d998fd1b955cb180ad1010c07ec35b1fd945b1b /setup.py
parent75ee3de301e7bea30c40fe26d857bb6cc7878f82 (diff)
parent0c7fa7556ced34444db82d2d2d3b51b4f5327586 (diff)
downloadmediagoblin-257b8ab62a6a5e04d60575a9766e5ed3503a15ed.tar.lz
mediagoblin-257b8ab62a6a5e04d60575a9766e5ed3503a15ed.tar.xz
mediagoblin-257b8ab62a6a5e04d60575a9766e5ed3503a15ed.zip
Merge remote-tracking branch 'refs/remotes/joar/notifications'
Conflicts: mediagoblin/db/migrations.py
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/setup.py b/setup.py
index f320e92c..a0a49a28 100644
--- a/setup.py
+++ b/setup.py
@@ -57,7 +57,7 @@ setup(
'webtest<2',
'ConfigObj',
'Markdown',
- 'sqlalchemy>=0.7.0',
+ 'sqlalchemy>=0.8.0',
'sqlalchemy-migrate',
'mock',
'itsdangerous',