diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-08-14 11:06:54 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-08-14 11:06:54 -0700 |
| commit | a249f8736ac601dff8e5c06d850016383cc28d82 (patch) | |
| tree | af14164b62402727d223a5a40af92197fe3b18bb /docs/architecture.rst | |
| parent | f09adf00142a96d8537f1dbab09db708f1298452 (diff) | |
| parent | f0e1fc5aadcde96a8c8e776c77dd80e91368d216 (diff) | |
| download | slixmpp-a249f8736ac601dff8e5c06d850016383cc28d82.tar.gz slixmpp-a249f8736ac601dff8e5c06d850016383cc28d82.tar.bz2 slixmpp-a249f8736ac601dff8e5c06d850016383cc28d82.tar.xz slixmpp-a249f8736ac601dff8e5c06d850016383cc28d82.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'docs/architecture.rst')
0 files changed, 0 insertions, 0 deletions