summaryrefslogtreecommitdiff
path: root/debian/control
diff options
authorWilliam Hsu <william.hsu@canonical.com>2019-09-16 18:30:57 +0800
committerWilliam Hsu <william.hsu@canonical.com>2019-09-16 18:30:57 +0800
commit3219520e21dc42a300cc9ffde78db62a1eeb2974 (patch)
treeb2314f6fc4940ff3e92b5e8e780202666b8e6b0d /debian/control
parenta7d781a386be42d7b60c0f89c0cd4e5b1f988326 (diff)
parentd1fb949870ba7cf15d3772e3997358b6ec2a1632 (diff)
Pulled the latest change to make sure there is no code conflict
Merge branch 'master' of git+ssh://git.launchpad.net/oem-qa-checkbox into oem-generic-wireless
Diffstat (limited to 'debian/control')
0 files changed, 0 insertions, 0 deletions