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)
commit51c342d45441249e1e70f8cb8825e0e06cd78895
tree2dab1fad75b33b66056487dc90dcbe8b6e64233f
parentb6ac5f5c66532e6f8825217344a4b04a20120814
parent9cc90057d8234047b6d684b1119dbf623b4d7344
Merge branch 'add-condition'

Conflicts:
htsworkflow/frontend/templates/samples/library_detail.html

Resolve differences between the headers of library_detail for
adding RDFa and reordering the sample details.
htsworkflow/frontend/samples/models.py
htsworkflow/frontend/templates/samples/library_detail.html