projects / contrib / Conifer.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6fabcc9 ab5fcb1)
Merge branch 'rel_2_3' of git.evergreen-ils.org:Evergreen into rel_2_3_mergery
authorDan Scott <dscott@laurentian.ca>
Wed, 15 Aug 2012 15:15:49 +0000 (11:15 -0400)
committerDan Scott <dscott@laurentian.ca>
Wed, 15 Aug 2012 15:15:49 +0000 (11:15 -0400)
commit3e941e75c1df46d42cc4fe36e429efb7993b28bc
tree4b799d3948337ef3d181ff67f53e397ed8e7cc34tree
parent6fabcc9d864fbaa7d3aa31010c34d07b3a4330dccommit | diff
parentab5fcb15d7ef895b0e9059a00568f658fc8a7ef2commit | diff
Merge branch 'rel_2_3' of git.evergreen-ils.org:Evergreen into rel_2_3_mergery

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>
Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm diff1 | diff2 | blob | history
Evergreen contribs