projects
/
contrib
/
Conifer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6fabcc9
ab5fcb1
)
Merge branch 'rel_2_3' of git.evergreen-ils.org:Evergreen into rel_2_3_mergery
author
Dan Scott
<dscott@laurentian.ca>
Wed, 15 Aug 2012 15:15:49 +0000
(11:15 -0400)
committer
Dan Scott
<dscott@laurentian.ca>
Wed, 15 Aug 2012 15:15:49 +0000
(11:15 -0400)
Conflicts:
Open-ILS/src/templates/opac/parts/advanced/search.tt2
Open-ILS/src/templates/opac/parts/org_selector.tt2
Signed-off-by: Dan Scott <dscott@laurentian.ca>
1
2
Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
Simple merge
projects / contrib / Conifer.git / commitdiff