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

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

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

parents 1018bc26 18779b75
Hide 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