commit 6fa9b922d5996728002f38106b966c5d76fea1a9 parent 35a1f60c8f92d5eeb4c34168566131cd227471c6 Author: Mark Feller <mfeller@recurly.com> Date: Wed, 15 Jan 2020 14:01:26 -0700 Merge branch 'master' of ssh://gitlab.com/mark.feller/rice Signed-off-by: Mark Feller <mfeller@recurly.com>