projects
/
working
/
Evergreen.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a0ae7d7
3785540
)
Merge remote-tracking branch 'working/user/berick/clear-shelf-shows-pickup-change...
author
Jason Stephenson
<jstephenson@mvlc.org>
Wed, 13 Mar 2013 13:45:54 +0000
(09:45 -0400)
committer
Jason Stephenson
<jstephenson@mvlc.org>
Wed, 13 Mar 2013 13:45:54 +0000
(09:45 -0400)
1
2
Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
patch
|
diff1
|
diff2
|
blob
|
history
Open-ILS/web/opac/locale/en-US/lang.dtd
patch
|
diff1
|
diff2
|
blob
|
history
Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
Simple merge
diff --cc
Open-ILS/web/opac/locale/en-US/lang.dtd
Simple merge
diff --cc
Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
Simple merge