diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-10-19 00:15:21 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-10-19 00:15:21 -0700 |
| commit | 0d448b82214ed8bed3477db375799ae8399d0393 (patch) | |
| tree | cad4b16d9c1622d858d70e6aae4dece230566734 /docs/architecture.rst | |
| parent | 77f2a339e1626501a1df388050f09342d7bbcd1d (diff) | |
| parent | e6c95f0a2acfd56ad47f60d9576a0db5458ed118 (diff) | |
| download | slixmpp-0d448b82214ed8bed3477db375799ae8399d0393.tar.gz slixmpp-0d448b82214ed8bed3477db375799ae8399d0393.tar.bz2 slixmpp-0d448b82214ed8bed3477db375799ae8399d0393.tar.xz slixmpp-0d448b82214ed8bed3477db375799ae8399d0393.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'docs/architecture.rst')
0 files changed, 0 insertions, 0 deletions