summaryrefslogtreecommitdiff
path: root/tests/twisted/fakeconnectivity.py
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2014-06-10 16:14:07 +0200
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2014-06-10 16:14:07 +0200
commit190de711459a51eb236b773a57b0c188ebf1da6a (patch)
tree9a665f3f61efbe9d3cae336ee082dd09fa377c07 /tests/twisted/fakeconnectivity.py
parent7a0e57c1d428ded3c22fdc1bc486d7211ddbab9c (diff)
parent224443c1843ab0df7ef8ee1eda0409c35a4745a9 (diff)
downloadtelepathy-mission-control-190de711459a51eb236b773a57b0c188ebf1da6a.tar.gz
Merge branch 'telepathy-mission-control-5.16'
Conflicts: src/mcd-account.c
Diffstat (limited to 'tests/twisted/fakeconnectivity.py')
0 files changed, 0 insertions, 0 deletions