diff options
| author | Lei Yan | 2014-07-14 16:23:12 +0000 |
|---|---|---|
| committer | Lei Yan | 2014-07-14 17:02:01 +0000 |
| commit | 214bf0128b8ecdda718983c5563cf34160743758 (patch) | |
| tree | 917e7a5ae78dc4ff65dc08d107a0e3ae3a47c67c /wqflask/cfg | |
| parent | 8de6fec18cd98a10c58702c448a1e01e147dc5f7 (diff) | |
| parent | fbdbf4b7410185e2a978ecc8e120ae56ff6da0ce (diff) | |
| download | genenetwork2-214bf0128b8ecdda718983c5563cf34160743758.tar.gz | |
Merge /home/zas1024/gene
Conflicts:
wqflask/wqflask/static/new/javascript/dataset_select_menu.js
wqflask/wqflask/templates/corr_scatter_plot_old.html
Diffstat (limited to 'wqflask/cfg')
| -rwxr-xr-x[-rw-r--r--] | wqflask/cfg/__init__.py | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | wqflask/cfg/default_settings.py | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/wqflask/cfg/__init__.py b/wqflask/cfg/__init__.py index e69de29b..e69de29b 100644..100755 --- a/wqflask/cfg/__init__.py +++ b/wqflask/cfg/__init__.py diff --git a/wqflask/cfg/default_settings.py b/wqflask/cfg/default_settings.py index e638a9c0..e638a9c0 100644..100755 --- a/wqflask/cfg/default_settings.py +++ b/wqflask/cfg/default_settings.py |