diff options
author | Lance Stout <lancestout@gmail.com> | 2014-02-06 09:20:24 -0800 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2014-02-06 09:20:24 -0800 |
commit | 49acdac7765498f11b79dd826742ce8570aae5d2 (patch) | |
tree | 318b38ce41c99b47f4235c69202b93135837a092 /sleekxmpp/roster | |
parent | 654420e351630523d9954e98da566cfd3be4b929 (diff) | |
parent | 7e1587faa28067b635068282acf4affe7a97e2ea (diff) | |
download | slixmpp-49acdac7765498f11b79dd826742ce8570aae5d2.tar.gz slixmpp-49acdac7765498f11b79dd826742ce8570aae5d2.tar.bz2 slixmpp-49acdac7765498f11b79dd826742ce8570aae5d2.tar.xz slixmpp-49acdac7765498f11b79dd826742ce8570aae5d2.zip |
Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop
Diffstat (limited to 'sleekxmpp/roster')
0 files changed, 0 insertions, 0 deletions