Merge branch 'master' of git.evergreen-ils.org:Evergreen into acq-po-activation-sans...
authorBill Erickson <berick@esilibrary.com>
Fri, 23 Sep 2011 21:41:35 +0000 (17:41 -0400)
committerBill Erickson <berick@esilibrary.com>
Fri, 23 Sep 2011 21:41:35 +0000 (17:41 -0400)
commit2d295cb0f9f26b72cc0e3f2fbb50c372fb772e4f
tree17319842beb3fce3b2b5d6e419c254b37698996a
parent492dd6a1ef0efde6fd968aa04429c45858864483
parentd0e5e7177e0e48246787aeebb410356522bdb709
Merge branch 'master' of git.evergreen-ils.org:Evergreen into acq-po-activation-sans-assets
Open-ILS/src/templates/acq/common/li_table.tt2
Open-ILS/src/templates/acq/po/view.tt2
Open-ILS/web/js/dojo/openils/acq/nls/acq.js