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

Merge branch 'smack-for-4.2-stacked' of https://github.com/cschaufler/smack-next into next

parents 8d94eb9b c0d77c88
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