Merge branch 'master' of git.evergreen-ils.org:Evergreen into user/berick/lp1452950...
authorBill Erickson <berickxx@gmail.com>
Thu, 17 Sep 2015 00:55:52 +0000 (20:55 -0400)
committerBill Erickson <berickxx@gmail.com>
Thu, 17 Sep 2015 00:55:52 +0000 (20:55 -0400)
1  2 
Open-ILS/web/js/ui/default/staff/services/grid.js
Open-ILS/web/js/ui/default/staff/services/ui.js