This is a partial merge of the stanford branch with the caltech branch of

[htsworkflow.git] / htsworkflow / frontend / settings.py

diff --git a/htsworkflow/frontend/settings.py b/htsworkflow/frontend/settings.py
index ec400418a4e4fcecaba21dd07014d1fc5e6d18ba..32272242a3548c5b943754f902e1241ccef2f737 100644 (file)
--- a/htsworkflow/frontend/settings.py
+++ b/htsworkflow/frontend/settings.py
@@ -143,11 +143,11 @@ INSTALLED_APPS = (
     'django.contrib.sessions',
     'django.contrib.sites',
     'htsworkflow.frontend.eland_config',
-    'htsworkflow.frontend.fctracker',
+    'htsworkflow.frontend.samples',
     # modules from htsworkflow branch
-    #'htswfrontend.exp_track',
-    #'htswfrontend.analys_track', 
-    #'htswfrontend.htsw_reports',
+    'htsworkflow.frontend.experiments',
+    'htsworkflow.frontend.analysis', 
+    'htsworkflow.frontend.reports',
     'django.contrib.databrowse',
 )