From: Tom Clegg <tom@curii.com>
Date: Wed, 28 Apr 2021 15:31:06 +0000 (-0400)
Subject: Merge branch '16997-sort-config-for-diff'
X-Git-Tag: 2.2.0~53
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/f5e60e18f701e135e0721307130d0acf6c7da183

Merge branch '16997-sort-config-for-diff'

fixes #16997

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>
---

f5e60e18f701e135e0721307130d0acf6c7da183