projects
/
evergreen-equinox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1184851
c4da3fe
)
Merge branch 'opac-tt-poc' into dbs/tt-opac-debrand
author
Dan Scott
<dan@coffeecode.net>
Mon, 2 May 2011 11:37:48 +0000 (07:37 -0400)
committer
Dan Scott
<dan@coffeecode.net>
Mon, 2 May 2011 11:37:48 +0000 (07:37 -0400)
Conflicts:
Open-ILS/web/templates/default/opac/parts/result/table.tt2
1
2
Open-ILS/web/templates/default/opac/parts/result/table.tt2
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Open-ILS/web/templates/default/opac/parts/result/table.tt2
Simple merge
projects / evergreen-equinox.git / commitdiff