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

Merge branch 'sm' into development 

Conflicts:
	src/eu/siacs/conversations/services/XmppConnectionService.java
parents 9de77b19 4435b005
Expand all 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