Merge branch 'django1.7' of mus.cacr.caltech.edu:htsworkflow into django1.7
authorDiane Trout <diane@ghic.org>
Wed, 11 Jan 2017 00:58:11 +0000 (16:58 -0800)
committerDiane Trout <diane@ghic.org>
Wed, 11 Jan 2017 00:58:11 +0000 (16:58 -0800)
commit8b77a191c722b023ffa8bdd5d3c78823ba2a096e
tree919d0a297d03e4b73d332bc5a189196d21191cf9
parent7fd611925cbf73184883fbaa152592cd81faeae3
parent7a3565541fa2af79efabd5d8735c0c1d6e7470a8
Merge branch 'django1.7' of mus.cacr.caltech.edu:htsworkflow into django1.7