Merge branch 'master' of git://git.evergreen-ils.org/Evergreen into hard_dates
authorMichele Morgan <mmorgan@noblenet.org>
Mon, 1 May 2017 21:03:41 +0000 (17:03 -0400)
committerMichele Morgan <mmorgan@noblenet.org>
Mon, 1 May 2017 21:03:41 +0000 (17:03 -0400)
commit25118c7159307eb4e43034940ac207b3b170f429
tree17b4e4369c61449b6af75e47bb128b3f7c6dab57
parentffe5e8a498cba9921284affe383937f3ad6acf1d
parent3e78c58976f5e635cb52fa14b0a6f01f47e1b599
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen into hard_dates