projects / htsworkflow.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 125a2f0)
Merge branch 'django1.4'
authorDiane Trout <diane@ghic.org>
Tue, 17 Dec 2013 19:20:03 +0000 (11:20 -0800)
committerDiane Trout <diane@ghic.org>
Tue, 17 Dec 2013 19:20:03 +0000 (11:20 -0800)
there was a conflict with my qualifying the load_pipeline_run_xml function call

Conflicts:
htsworkflow/frontend/samples/views.py


No differences found
htsworkflow sequencing LIMS software