Skip to content
Commit cdac74dd authored by James Morris's avatar James Morris
Browse files

Merge branch 'smack-for-4.13' of git://github.com/cschaufler/smack-next into next

parents e4b08527 f28e783f
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment