]> git.evergreen-ils.org Git - working/Evergreen.git/commit
projects / working / Evergreen.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f8f9b79 ca413e9)
Merge remote branch 'working/user/rri/ttopac' into template-toolkit-opac-master-merge
authorBill Erickson <berick@esilibrary.com>
Wed, 3 Aug 2011 14:50:04 +0000 (10:50 -0400)
committerBill Erickson <berick@esilibrary.com>
Wed, 3 Aug 2011 14:50:04 +0000 (10:50 -0400)
commit86e74c400a76655d90f1625a174851fec690036d
treee4d487f82d6fc25ff481212524b233de63be1709tree
parentf8f9b7932135b53931bc040afc8303b11827864ecommit | diff
parentca413e996425d831fb35ece615e1c869d5831b96commit | diff
Merge remote branch 'working/user/rri/ttopac' into template-toolkit-opac-master-merge

With some minor merge conflict repair

Signed-off-by: Bill Erickson <berick@esilibrary.com>
Open-ILS/src/templates/default/opac/myopac/circ_history.tt2 diff1 | | blob | history
Open-ILS/src/templates/default/opac/myopac/circs.tt2 diff1 | | blob | history
Open-ILS/src/templates/default/opac/myopac/hold_history.tt2 diff1 | | blob | history
Open-ILS/src/templates/default/opac/myopac/holds.tt2 diff1 | | blob | history
Open-ILS/src/templates/default/opac/myopac/lists.tt2 diff1 | | blob | history
Open-ILS/src/templates/default/opac/parts/advanced/global_row.tt2 diff1 | | blob | history
Open-ILS/src/templates/default/opac/parts/advanced/search.tt2 diff1 | | blob | history
Open-ILS/src/templates/default/opac/parts/anon_list.tt2 diff1 | | blob | history
Open-ILS/src/templates/default/opac/parts/record/cn_details.tt2 diff1 | | blob | history
Evergreen ILS