projects / evergreen-equinox.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e7527d5 b13145b)
Merge branch 'opac-tt-poc' of git+ssh://yeti.esilibrary.com/home/evergreen/evergreen...
authorBill Erickson <berick@esilibrary.com>
Wed, 26 Jan 2011 20:14:26 +0000 (15:14 -0500)
committerBill Erickson <berick@esilibrary.com>
Wed, 26 Jan 2011 20:14:26 +0000 (15:14 -0500)
Conflicts:
Open-ILS/src/perlmods/OpenILS/WWW/EGCatLoader.pm


Trivial merge
Evergreen with Equinox developments in process and local tweaks