diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-12-31 12:34:17 -0500 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-12-31 12:34:17 -0500 |
| commit | fa912aeb84a95d1cf72639587488aa64cf556aa7 (patch) | |
| tree | 68f088d0a0e5164064ac9589eee35ee9468d45f2 /docs/guide_xep_0030.rst | |
| parent | 9a5e2ae7686a2dad72f2aea2592ab002111003da (diff) | |
| parent | 4a12e1059a8cc38a3baf30a18dd6143e7d5beebb (diff) | |
| download | slixmpp-fa912aeb84a95d1cf72639587488aa64cf556aa7.tar.gz slixmpp-fa912aeb84a95d1cf72639587488aa64cf556aa7.tar.bz2 slixmpp-fa912aeb84a95d1cf72639587488aa64cf556aa7.tar.xz slixmpp-fa912aeb84a95d1cf72639587488aa64cf556aa7.zip | |
Merge branch 'develop' into develop-1.1
Diffstat (limited to 'docs/guide_xep_0030.rst')
0 files changed, 0 insertions, 0 deletions