From: Chris Sharp Date: Thu, 20 Jul 2017 17:45:27 +0000 (-0400) Subject: Merge branch 'master' of git.evergreen-ils.org:contrib/pines/genasys X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=878b1f078141d98add564ebe90897d97d762269b;p=contrib%2Fpines%2Fgenasys.git Merge branch 'master' of git.evergreen-ils.org:contrib/pines/genasys --- 878b1f078141d98add564ebe90897d97d762269b diff --cc templates/setup-vars index 1c2ed56,6864676..593792d mode 100644,100755..100755 --- a/templates/setup-vars +++ b/templates/setup-vars