From: Andrea Buntz Neiman <abneiman@equinoxinitiative.org>
Date: Mon, 21 Oct 2019 20:33:44 +0000 (-0400)
Subject: Merge branch 'master' of git.evergreen-ils.org:Evergreen
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=4cf0108ef9b1840d5fe14be07ec709f64e7e3c6b;p=contrib%2FConifer.git

Merge branch 'master' of git.evergreen-ils.org:Evergreen
---

4cf0108ef9b1840d5fe14be07ec709f64e7e3c6b