projects / htsworkflow.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4a2529d c15b640)
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)
commit125a2f05ae50945b0bd7c9f878de885c91f213eb
tree009f2e7f9fe090e0dd59fba08aeb35d94f54d610tree | snapshot
parent4a2529df5d2bdaa83d1661730c3791560d58df37commit | diff
parentc15b6405bc2693a0218b76c4c732a0372a10dad4commit | diff
Merge branch 'django1.4'

there was a conflict with my qualifying the load_pipeline_run_xml function call

Conflicts:
htsworkflow/frontend/samples/views.py
htsworkflow/pipelines/retrieve_config.py diff1 | diff2 | blob | history
htsworkflow/pipelines/srf.py diff1 | diff2 | blob | history
htsworkflow/pipelines/test/test_runfolder_rta180.py diff1 | diff2 | blob | history
htsworkflow sequencing LIMS software