diff options
| author | Lance Stout <lancestout@gmail.com> | 2013-01-21 02:34:22 -0800 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2013-01-21 02:34:22 -0800 |
| commit | bad405bea96405eb952888dc6996b8b40be85ac4 (patch) | |
| tree | b5998707d5d8d836eaa807f1e755047c1aed5c48 /docs/glossary.rst | |
| parent | 648f3f978a84445ed188be055453ac4cab3ed4f5 (diff) | |
| parent | 4f9a95b011277ab64a137aceeb4df2e9fc0f1e25 (diff) | |
| download | slixmpp-bad405bea96405eb952888dc6996b8b40be85ac4.tar.gz slixmpp-bad405bea96405eb952888dc6996b8b40be85ac4.tar.bz2 slixmpp-bad405bea96405eb952888dc6996b8b40be85ac4.tar.xz slixmpp-bad405bea96405eb952888dc6996b8b40be85ac4.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'docs/glossary.rst')
0 files changed, 0 insertions, 0 deletions