diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-08-13 11:12:41 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-08-13 11:12:41 -0700 |
| commit | 04dc68f5f63508a512e7fbebc873a85961fdb005 (patch) | |
| tree | c9f90aa9c0cccdac7d2370e156c1cc2a9d702718 /sleekxmpp/plugins/xep_0060 | |
| parent | 5c25208fb53e5fd08be032ce96307302d18ab27b (diff) | |
| parent | 92be0514504747811af0b4f160fe8f2b63bf454d (diff) | |
| download | slixmpp-04dc68f5f63508a512e7fbebc873a85961fdb005.tar.gz slixmpp-04dc68f5f63508a512e7fbebc873a85961fdb005.tar.bz2 slixmpp-04dc68f5f63508a512e7fbebc873a85961fdb005.tar.xz slixmpp-04dc68f5f63508a512e7fbebc873a85961fdb005.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/plugins/xep_0060')
0 files changed, 0 insertions, 0 deletions