diff options
author | Samuel Hand <samuel.hand@openmailbox.org> | 2018-08-04 23:37:55 +0100 |
---|---|---|
committer | Samuel Hand <samuel.hand@openmailbox.org> | 2018-08-04 23:37:55 +0100 |
commit | ed3b36d0de50966de907766ac0fd6bc7713f0374 (patch) | |
tree | eac6ade41c7cb727de429f1eb9b2454b77118045 /plugins/omemo | |
parent | 01d26bffd890c08dfd374631c498fec614cdf430 (diff) | |
parent | a19f988301332680e23fd81031935eb1312d3173 (diff) | |
download | dino-ed3b36d0de50966de907766ac0fd6bc7713f0374.tar.gz dino-ed3b36d0de50966de907766ac0fd6bc7713f0374.zip |
Merge branch 'master' into omemo-muc
Diffstat (limited to 'plugins/omemo')
0 files changed, 0 insertions, 0 deletions