Merge branch 'add-condition'
authorDiane Trout <diane@caltech.edu>
Thu, 26 May 2011 17:47:24 +0000 (10:47 -0700)
committerDiane Trout <diane@caltech.edu>
Thu, 26 May 2011 17:47:24 +0000 (10:47 -0700)
Conflicts:
htsworkflow/frontend/templates/samples/library_detail.html

Resolve differences between the headers of library_detail for
adding RDFa and reordering the sample details.

1  2 
htsworkflow/frontend/samples/models.py
htsworkflow/frontend/templates/samples/library_detail.html