Merge branch 'django1.7' of mus.cacr.caltech.edu:htsworkflow into django1.7
authorDiane Trout <diane@ghic.org>
Fri, 27 Mar 2015 18:13:50 +0000 (11:13 -0700)
committerDiane Trout <diane@ghic.org>
Fri, 27 Mar 2015 18:13:50 +0000 (11:13 -0700)
commit278c6567bfd3fb276b8bcbe0a922fb1895cb163e
tree03148d367c2697fd2ef17ad84f9ad018a3da059c
parenta28a1c6a1ae9257e757e67e8a8a6ac9b02b479fa
parenta0fce405a5302a0914bdfcdad555893b3e18c426
Merge branch 'django1.7' of mus.cacr.caltech.edu:htsworkflow into django1.7
encode_submission/encode3.py
htsworkflow/submission/submission.py