projects / working / Evergreen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 98d0edd 26d5295)
Merge branch 'master' of git.evergreen-ils.org:Evergreen into collab/berick/lp1775466...
authorBill Erickson <berickxx@gmail.com>
Fri, 24 Aug 2018 14:40:25 +0000 (10:40 -0400)
committerBill Erickson <berickxx@gmail.com>
Fri, 24 Aug 2018 14:40:25 +0000 (10:40 -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