Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

parents fa5b5b26 af96f0d6
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