Merge branch 'master' into wip_alan_T5681_fix_bootstrap4_detection
authorAlan Knowles <alan@roojs.com>
Thu, 24 Jan 2019 07:07:50 +0000 (15:07 +0800)
committerAlan Knowles <alan@roojs.com>
Thu, 24 Jan 2019 07:07:50 +0000 (15:07 +0800)
commitc5a9cb7dca7e724f4454904ce754cbac8d8d8082
tree4300e9a45524edf9bca59ae6681c727ebb224da3
parent1e1687bd5606bd25f40eb37e6cf65e4f4efe93ab
parent5aeb7e7613454bfb7bfb22be8a21d994fb1063a4
Merge branch 'master' into wip_alan_T5681_fix_bootstrap4_detection