diff options
| author | Zachary Sloan | 2013-06-14 21:19:48 +0000 |
|---|---|---|
| committer | Zachary Sloan | 2013-06-14 21:19:48 +0000 |
| commit | 0ce9a060640710b5a6e18f71b08d79e51ef71d8a (patch) | |
| tree | 609043382f63a5ccf72d74a8a97ed5393bd608cd | |
| parent | 392272095baf02496405031d488e32ef68b0f85f (diff) | |
| parent | 2a5f19619a4bf210f67d42d9e196f9e5c2aa9ab2 (diff) | |
| download | genenetwork2-0ce9a060640710b5a6e18f71b08d79e51ef71d8a.tar.gz | |
Merge git://github.com/leiyan/GeneNetwork2-Python into flask
Conflicts:
wqflask/requirements.txt
Made small change for merge with Lei's branch
| -rw-r--r-- | wqflask/requirements.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/wqflask/requirements.txt b/wqflask/requirements.txt index cd75ae9a..6b07b380 100644 --- a/wqflask/requirements.txt +++ b/wqflask/requirements.txt @@ -1,8 +1,9 @@ Flask==0.9 Jinja2==2.6 -MySQL-python==1.2.3 +#MySQL-python==1.2.3 Piddle==0.1-dev PyYAML==3.10 +#Reaper==1.0 SQLAlchemy==0.7.9 Werkzeug==0.8.3 logging-tree==1.1 |