Merge branch 'master' of git.evergreen-ils.org:Evergreen
authorAndrea Buntz Neiman <abneiman@equinoxinitiative.org>
Mon, 21 Oct 2019 20:33:44 +0000 (16:33 -0400)
committerAndrea Buntz Neiman <abneiman@equinoxinitiative.org>
Mon, 21 Oct 2019 20:33:44 +0000 (16:33 -0400)

Trivial merge