summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Hutchings <ben.hutchings@codethink.co.uk>2020-06-01 15:21:28 +0100
committerBen Hutchings <ben.hutchings@codethink.co.uk>2020-06-01 15:23:53 +0100
commit8976b895d5c026c4976a6ddeabe8487f80940dd4 (patch)
tree68ef9ef6e8f3a8aecd262d84d3a8aa683180cc7a
parent59759d6fc55786074daefaec1ecb649700dd5180 (diff)
parent3e7a27fc09ac92db07c404bc88d3f1844faca94c (diff)
downloadlorry-controller-8976b895d5c026c4976a6ddeabe8487f80940dd4.tar.gz
Merge branch 'bwh/trovekube' into bwh/python3
This is a dummmy merge that discards the version pinning added on bwh/trovekube, since we no longer use Python 2.
0 files changed, 0 insertions, 0 deletions