aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLei Yan2013-06-19 21:04:30 +0000
committerLei Yan2013-06-19 21:04:30 +0000
commit71f1a5d52d58d07294ef3f2cfa87026025358e74 (patch)
treec98d7f9a05b9822e3df8e0d3a5ed87f2b911b547
parent6d5a94c699d1653a3ca76a9500082b8803cdaedf (diff)
parent2a5f19619a4bf210f67d42d9e196f9e5c2aa9ab2 (diff)
downloadgenenetwork2-71f1a5d52d58d07294ef3f2cfa87026025358e74.tar.gz
:Merge git://github.com/zsloan/genenetwork into flask
Conflicts: wqflask/requirements.txt
-rw-r--r--wqflask/requirements.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/wqflask/requirements.txt b/wqflask/requirements.txt
index cd75ae9a..4449c0e7 100644
--- a/wqflask/requirements.txt
+++ b/wqflask/requirements.txt
@@ -1,6 +1,6 @@
Flask==0.9
Jinja2==2.6
-MySQL-python==1.2.3
+#MySQL-python==1.2.3
Piddle==0.1-dev
PyYAML==3.10
SQLAlchemy==0.7.9