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

Merge branch 'feature/mam' into development 

Conflicts:
	src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
parents 2368ba51 b523518e
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