aboutsummaryrefslogtreecommitdiff
path: root/web
diff options
context:
space:
mode:
authorzsloan2015-04-06 21:34:23 +0000
committerzsloan2015-04-06 21:34:23 +0000
commit1823434ff8b54df0bd8ce1d7d19a37d74e850dd5 (patch)
tree0d28ffb56862d41e71dfb23708241e8c7342ab9a /web
parent4ad55a0ebc1fc77da8e9aa6ec565b2b10c373e9b (diff)
parent0e21a58cfe7ca1ec6c1d84c43e1d2fd2d0b9104c (diff)
downloadgenenetwork2-1823434ff8b54df0bd8ce1d7d19a37d74e850dd5.tar.gz
Added secure_server.py to gitignore and fixed conflicts for merging Lei's new code
Diffstat (limited to 'web')
-rw-r--r--web/images/edit.pngbin0 -> 4322 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/web/images/edit.png b/web/images/edit.png
new file mode 100644
index 00000000..dda50521
--- /dev/null
+++ b/web/images/edit.png
Binary files differ