old-git.evergreen-ils.org Git - contrib/Conifer.git/commit

author	Bill Erickson <berick@esilibrary.com>
	Mon, 29 Aug 2011 17:37:19 +0000 (13:37 -0400)
committer	Bill Erickson <berick@esilibrary.com>
	Mon, 29 Aug 2011 17:37:19 +0000 (13:37 -0400)
commit	87f00eefa05b039019464aac9d0679998f36f6d4
tree	c27f4f81057f65765d7db57dc54ce4bf77286327	tree
parent	e97ae45e48e3df2fb697886d8cdef61f9e24228e	commit \| diff
parent	d1b79a261ce05c385cfe334d829470fd63966f37	commit \| diff

Tpac: merged esi/template-toolkit-opac; conflict resolution

Signed-off-by: Bill Erickson <berick@esilibrary.com>

Evergreen contribs

Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/myopac/lists.tt2	diff1 \|	\|	blob \| history
Open-ILS/src/templates/default/opac/parts/anon_list.tt2	diff1 \|	\|	blob \| history
Open-ILS/src/templates/default/opac/parts/place_hold.tt2	diff1 \|	\|	blob \| history
Open-ILS/src/templates/default/opac/parts/place_hold_result.tt2	\|	\|	blob
Open-ILS/src/templates/default/opac/parts/searchbar.tt2	diff1 \|	\|	blob \| history
Open-ILS/src/templates/default/opac/place_hold.tt2	diff1 \|	\|	blob \| history
Open-ILS/src/templates/default/opac/results.tt2	diff1 \|	\|	blob \| history
Open-ILS/web/css/skin/default/opac/style.css	diff1 \|	diff2 \|	blob \| history