diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-12-21 13:44:08 -0800 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-12-21 13:44:08 -0800 |
| commit | 9ae3a7dbff6f0828a41b003cf0e9efadc14fc1c7 (patch) | |
| tree | 1eea45604baf3897e2f4139b8871ac59e595cd53 /sleekxmpp/features/feature_preapproval | |
| parent | 29c049612a181e480371f3a686170a87af1e9f98 (diff) | |
| parent | 3519e845a35d6ac1fdd07091b99f02a8a391147a (diff) | |
| download | slixmpp-9ae3a7dbff6f0828a41b003cf0e9efadc14fc1c7.tar.gz slixmpp-9ae3a7dbff6f0828a41b003cf0e9efadc14fc1c7.tar.bz2 slixmpp-9ae3a7dbff6f0828a41b003cf0e9efadc14fc1c7.tar.xz slixmpp-9ae3a7dbff6f0828a41b003cf0e9efadc14fc1c7.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/features/feature_preapproval')
0 files changed, 0 insertions, 0 deletions