projects / working / Evergreen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 259f04e 4b094b1)
Merge branch 'master' of git.evergreen-ils.org:Evergreen into user/berick/lp1452950...
authorBill Erickson <berickxx@gmail.com>
Wed, 18 Nov 2015 00:50:13 +0000 (19:50 -0500)
committerBill Erickson <berickxx@gmail.com>
Wed, 18 Nov 2015 00:50:13 +0000 (19:50 -0500)
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