Skip to content
Commit d43aeb72 authored by iNPUTmice's avatar iNPUTmice
Browse files

Merge branch 'master' into development 

Conflicts:
	src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
parents ac8c2b7e 279534dd
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