Merge branch 'gmerge' into gmaster

# Conflicts:
#	cellxgene_gateway/backend_cache.py
#	cellxgene_gateway/cache_entry.py
#	cellxgene_gateway/env.py
#	cellxgene_gateway/gateway.py
#	cellxgene_gateway/subprocess_backend.py
#	tests/test_cache_entry.py
#	tests/test_dir_util.py
This commit is contained in:
Alok Saldanha
2020-08-30 13:47:22 -04:00
15 changed files with 110 additions and 39 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
name: cellxgene-dev
name: cellxgene-gateway
channels:
- conda-forge
dependencies: