diff options
| author | Richard van der Hoff <richard@matrix.org> | 2016-05-25 15:46:50 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2016-05-25 15:46:50 +0100 |
| commit | 27b57c8d8830ebd37ad304703ccb61390d4b0f36 (patch) | |
| tree | 752f4c117ccf73c65ebcc853a17759f1ed4a5fa7 /include/olm/olm.hh | |
| parent | 54d43010c808b56caa703696a036df18d2b74575 (diff) | |
| parent | fae8dacab5233c46f09e7d869afadaead2842609 (diff) | |
Merge branch 'rav/more_group_chat/1'
Diffstat (limited to 'include/olm/olm.hh')
0 files changed, 0 insertions, 0 deletions