projects
/
htsworkflow.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3ecb135
0756aa9
)
Merge branch 'django1.4' of mus.cacr.caltech.edu:htsworkflow into django1.4
author
Diane Trout
<diane@caltech.edu>
Tue, 8 Jan 2013 01:51:28 +0000
(17:51 -0800)
committer
Diane Trout
<diane@caltech.edu>
Tue, 8 Jan 2013 01:51:28 +0000
(17:51 -0800)
I fixed one of the time-stamp formats on both development machines.
Conflicts:
htsworkflow/pipelines/gerald.py
Trivial merge
projects / htsworkflow.git / commitdiff