aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Wielicki <j.wielicki@sotecware.net>2017-10-10 08:32:42 +0200
committerJonas Wielicki <j.wielicki@sotecware.net>2017-10-10 08:32:42 +0200
commit746cbc7f38fac33b9eca4dd7f80327f4c52e3a92 (patch)
treedfcf7d0da289990270a718af6809c2601896767c
parent02b04c80bd82df55e5ec49b5d2fa5b879c0076c8 (diff)
parenta551c93537195d8eb356ac6646e399a199ade2cc (diff)
parentf57b8ae7dffbf4a7b013b109849ab89a92331e7a (diff)
parented6380444422c5599f22f4e5a763c9ed7ce6c612 (diff)
Merge branches 'feature/xep-0391', 'feature/xep-0060', 'feature/protoxep-cap' and 'feature/protoxep-jet-omemo'