projects / working / Evergreen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3dca3e5 beee20c)
Merge branch 'master' of git.evergreen-ils.org:Evergreen into collab/berick/lp1775466...
authorBill Erickson <berickxx@gmail.com>
Fri, 3 Aug 2018 17:38:51 +0000 (13:38 -0400)
committerBill Erickson <berickxx@gmail.com>
Fri, 3 Aug 2018 17:38:51 +0000 (13:38 -0400)
1  2 
Open-ILS/examples/fm_IDL.xml patch | diff1 | diff2 | blob | history
Open-ILS/web/js/ui/default/staff/services/hatch.js patch | diff1 | diff2 | blob | history

diff --cc Open-ILS/examples/fm_IDL.xml
Simple merge
Evergreen ILS