summaryrefslogtreecommitdiff
path: root/conftest.py
diff options
context:
space:
mode:
authorAngelos Evripiotis <angelos.evripiotis@gmail.com>2019-01-16 15:13:06 +0000
committerAngelos Evripiotis <angelos.evripiotis@gmail.com>2019-01-16 15:13:06 +0000
commit780d0f3a44f95f459ec578e6b652ac8634975ea5 (patch)
tree2decea9575de5f4cc3b36214ec823670a0be611c /conftest.py
parent6c428bc96bc0cd2bb3879db63d72d08ab88996b7 (diff)
parent2648b0bd1b9828b46284aafa92133fc8d8c9010f (diff)
downloadbuildstream-780d0f3a44f95f459ec578e6b652ac8634975ea5.tar.gz
Merge branch 'chadnan' into 'master'
bst-docker-import: fix Chandan's name See merge request BuildStream/buildstream!1076
Diffstat (limited to 'conftest.py')
0 files changed, 0 insertions, 0 deletions