projects / evergreen / masslnc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6a244e8 6d21b94)
Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac...
authorBill Erickson <berick@esilibrary.com>
Thu, 8 Sep 2011 21:52:01 +0000 (17:52 -0400)
committerBill Erickson <berick@esilibrary.com>
Thu, 8 Sep 2011 21:52:01 +0000 (17:52 -0400)
1  2 
Open-ILS/examples/fm_IDL.xml patch | diff1 | diff2 | blob | history

diff --cc Open-ILS/examples/fm_IDL.xml
Simple merge
Evergreen working repo (MassLNC)