Skip to content
Commit add7cc46 authored by Marius Burkard's avatar Marius Burkard
Browse files

Merge branch 'master' into 'master' 

add XMPP fields in client template database table



See merge request !248
parents 8938c852 d8824923
Show 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