aboutsummaryrefslogtreecommitdiff
path: root/plugins/omemo/data
diff options
context:
space:
mode:
authorSamuel Hand <sdhand@users.noreply.github.com>2018-07-07 12:12:31 +0100
committerGitHub <noreply@github.com>2018-07-07 12:12:31 +0100
commitf3c82094cd5d232226907f61f6d58402f99e10db (patch)
tree062a58e2bb830a004b948c35854a2bcb5d79cb27 /plugins/omemo/data
parent7da735b844da1b80a11135d22b011cabf54ad0fe (diff)
parent3a00177a51e48d6bafc1e67bab26bc510e6400d8 (diff)
downloaddino-f3c82094cd5d232226907f61f6d58402f99e10db.tar.gz
dino-f3c82094cd5d232226907f61f6d58402f99e10db.zip
Merge branch 'master' into omemo-trust-ui
Diffstat (limited to 'plugins/omemo/data')
0 files changed, 0 insertions, 0 deletions