]> git.evergreen-ils.org Git - working/Evergreen.git/commit
Merge branch 'opac-tt-poc' into dbs/tt-opac-debrand
authorDan Scott <dan@coffeecode.net>
Mon, 2 May 2011 11:37:48 +0000 (07:37 -0400)
committerDan Scott <dan@coffeecode.net>
Mon, 2 May 2011 11:37:48 +0000 (07:37 -0400)
commita34bd6c164a40cff6c2a85397713fdbe38c0399e
treeed0ca1eaae33a726bd64952dcbdf25cb04fbae67
parent1184851a7cd793a242a6f94851735117d6153c29
parentc4da3fe71817a2a8d02dfbd9b8f192d5fab2aa14
Merge branch 'opac-tt-poc' into dbs/tt-opac-debrand

Conflicts:
Open-ILS/web/templates/default/opac/parts/result/table.tt2
Open-ILS/web/templates/default/opac/parts/result/table.tt2