projects / working / Evergreen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9f06943 34c2878)
Merge branch 'master' of git.evergreen-ils.org:Evergreen into web-staff-proto
authorBill Erickson <berick@esilibrary.com>
Tue, 6 May 2014 17:27:09 +0000 (13:27 -0400)
committerBill Erickson <berick@esilibrary.com>
Tue, 6 May 2014 17:27:09 +0000 (13:27 -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 ILS