aboutsummaryrefslogtreecommitdiff
path: root/python/olm/__main__.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2016-05-24 16:30:23 +0100
committerRichard van der Hoff <richard@matrix.org>2016-05-24 16:30:23 +0100
commited039d331ce2f2c35063501a22db6c59edc881cf (patch)
tree228143f8ecefaa26394fd195a5f33bdb201266a7 /python/olm/__main__.py
parenta49d7284f3e1bee5a95eafeab9a816a2fa7112dd (diff)
parent8d31f42b1e5fd198918166edeec61f57059c6db9 (diff)
Merge branch 'master' into rav/jenkins_build
Diffstat (limited to 'python/olm/__main__.py')
0 files changed, 0 insertions, 0 deletions