]> git.evergreen-ils.org Git - working/Evergreen.git/commit - Open-ILS/web/templates/default/conify/global/booking/resource_attr.tt2
Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac...
authorBill Erickson <berick@esilibrary.com>
Thu, 1 Sep 2011 13:27:45 +0000 (09:27 -0400)
committerBill Erickson <berick@esilibrary.com>
Thu, 1 Sep 2011 13:27:45 +0000 (09:27 -0400)
commit5c86e9989a8d6076ddb206faaf29815dbe4ec828
tree9401fe708adedb6da352af31490b895b40a2eb55
parente7b515aa363e3990fdbe7f5b6104999911e568a8
parentb5579dee0f48f43157ad995669e42a8bf2cc1c80
Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac-master-merge