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)
commit8fe139eec98519805611a4d2dd4461dc0638590d
tree43f07d22bfa4ec0859b8992eb99e70011d24568e
parent3dca3e5d27e59bc03936edae14bff51d82964714
parentbeee20c5b0a63bf8248a630686f2fb262d4789ac
Merge branch 'master' of git.evergreen-ils.org:Evergreen into collab/berick/lp1775466-ang6-base-app
Open-ILS/examples/fm_IDL.xml
Open-ILS/web/js/ui/default/staff/services/hatch.js