Merge branch 'django1.7' of mus.cacr.caltech.edu:htsworkflow into django1.7
authorDiane Trout <diane@ghic.org>
Wed, 29 Oct 2014 17:34:19 +0000 (10:34 -0700)
committerDiane Trout <diane@ghic.org>
Wed, 29 Oct 2014 17:34:19 +0000 (10:34 -0700)
commit6fd851b684cdf4bd959880d9309d1a74e443c4ac
tree505af5dde0f4dc9170b3a27e7b0577338c95c760
parent7a2aaaa9d3fb96dda393635c19e59f4e625fcda1
parentfc43c60a1d665aad1f1248da1681a6bb1ac5bac1
Merge branch 'django1.7' of mus.cacr.caltech.edu:htsworkflow into django1.7