diff options
| author | Pedro Vicente <pedrovfer@gmail.com> | 2012-11-12 13:55:32 +0100 |
|---|---|---|
| committer | Pedro Vicente <pedrovfer@gmail.com> | 2012-11-12 13:55:32 +0100 |
| commit | a1d988fed5839a0d6f44340ed3dae8496e1b9a58 (patch) | |
| tree | 0c2a657ad63afbeb2b82d0d3453608e8a907c04e /docs/glossary.rst | |
| parent | 2d066c34fd58882901fea0d82c34ad37e312cd27 (diff) | |
| parent | b0c50b7a59fbc18cb01158fc901013a63ed87b90 (diff) | |
| download | slixmpp-a1d988fed5839a0d6f44340ed3dae8496e1b9a58.tar.gz slixmpp-a1d988fed5839a0d6f44340ed3dae8496e1b9a58.tar.bz2 slixmpp-a1d988fed5839a0d6f44340ed3dae8496e1b9a58.tar.xz slixmpp-a1d988fed5839a0d6f44340ed3dae8496e1b9a58.zip | |
Merge branch 'upgrading_sleekxmpp_1_1_11' into develop_sleek
Diffstat (limited to 'docs/glossary.rst')
0 files changed, 0 insertions, 0 deletions