diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2019-09-30 13:08:23 +0000 |
|---|---|---|
| committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-09-30 13:08:23 +0000 |
| commit | 44c2e47a3ec72d034441fa5b1663131e15aa0dc5 (patch) | |
| tree | 719ba60dd7860eace878bcbf286413253294ec72 /include/olm/memory.h | |
| parent | 57b6839c2574c9bcfd0ba2e1bef4996e07fc8045 (diff) | |
| parent | b83a0c0992217b47848d3da00215503f4b65bd0a (diff) | |
Merge branch 'dbkr/wrong_comment_breaks_everything' into 'master'
Fix comment and also js build
See merge request matrix-org/olm!7
Diffstat (limited to 'include/olm/memory.h')
0 files changed, 0 insertions, 0 deletions