Skip to content
Commit d933f1e2 authored by Till Brehm's avatar Till Brehm
Browse files

Merge branch 'master' into 'master' 

Optimized prosody configuration and full OMEMO support

See merge request !785
parents 04272058 8f68c0e4
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment