aboutsummaryrefslogtreecommitdiff
path: root/include/olm/memory.hh
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2016-05-26 13:58:14 +0100
committerRichard van der Hoff <richard@matrix.org>2016-05-26 13:58:14 +0100
commit952a3e15cf498b21eef9a13152ca704bca2f9723 (patch)
tree02e80f655ceaf09f5028ef80242aaddd223d1e8b /include/olm/memory.hh
parent09b8c3d7bc9e62760ed17575159de655e90b399b (diff)
parent389a181ea860107aad3f657bc54476fc3b824080 (diff)
Merge branch 'rav/group_chat_js_bindings'
Diffstat (limited to 'include/olm/memory.hh')
0 files changed, 0 insertions, 0 deletions