diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-10-24 13:00:01 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-10-24 13:00:01 -0700 |
| commit | 14c9e9a9cc263a2695cb9d8e5575d60bd0a55197 (patch) | |
| tree | 5e72741f828a0f1852086c6be83e23c7f94d10f1 /docs/conf.py | |
| parent | 931d49560a1ebf3b767d20f8aeb692dd30a518c3 (diff) | |
| parent | a22ca228cc3a121da8bad4268c39bff5190db969 (diff) | |
| download | slixmpp-14c9e9a9cc263a2695cb9d8e5575d60bd0a55197.tar.gz slixmpp-14c9e9a9cc263a2695cb9d8e5575d60bd0a55197.tar.bz2 slixmpp-14c9e9a9cc263a2695cb9d8e5575d60bd0a55197.tar.xz slixmpp-14c9e9a9cc263a2695cb9d8e5575d60bd0a55197.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'docs/conf.py')
0 files changed, 0 insertions, 0 deletions