diff options
| author | Richard van der Hoff <richard@matrix.org> | 2016-09-23 11:55:28 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2016-09-23 11:55:28 +0100 |
| commit | 6ea9fb450ec1ef10b32d65ceb00a6042b927a95c (patch) | |
| tree | ebef09423d96c58d615451f927c33ba004dac308 /include/olm/olm.hh | |
| parent | 97c991ffee7f59dac1615b2f0b187470782ef0a4 (diff) | |
| parent | 4049261867fc1a4d9e7689635788d538a09aab31 (diff) | |
Merge branch 'rav/megolm_spec'
Diffstat (limited to 'include/olm/olm.hh')
0 files changed, 0 insertions, 0 deletions