projects
/
contrib
/
Conifer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9bd8972
e1658e2
)
Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
author
Mike Rylander
<mrylander@gmail.com>
Tue, 2 Aug 2011 18:39:31 +0000
(14:39 -0400)
committer
Mike Rylander
<mrylander@gmail.com>
Tue, 2 Aug 2011 18:39:31 +0000
(14:39 -0400)
1
2
Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
patch
|
diff1
|
diff2
|
blob
|
history
Open-ILS/xul/staff_client/server/patron/holds.js
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
Simple merge
diff --cc
Open-ILS/xul/staff_client/server/patron/holds.js
Simple merge