aboutsummaryrefslogtreecommitdiff
path: root/src/olm.cpp
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2016-10-20 11:43:41 +0100
committerRichard van der Hoff <richard@matrix.org>2016-10-20 11:43:41 +0100
commit65b334531754d9decf485975ffd2f9591bc80e84 (patch)
treeed3939cc452ef3d8c1ded52eb16bb0a29059e441 /src/olm.cpp
parent5f1b93bd0fa06a603d5d4a88af71bef7fd5143fb (diff)
parent68d98234e1cfd2893f58c41022ae169ce59b8f3c (diff)
Merge branch 'master'
Diffstat (limited to 'src/olm.cpp')
0 files changed, 0 insertions, 0 deletions