summaryrefslogtreecommitdiff
path: root/docs/event_index.rst
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-08-14 09:55:05 -0700
committerLance Stout <lancestout@gmail.com>2012-08-14 09:55:05 -0700
commitf09adf00142a96d8537f1dbab09db708f1298452 (patch)
tree26d62a9d60a02e2a8e7e821a04c217ca3e966e3d /docs/event_index.rst
parent04dc68f5f63508a512e7fbebc873a85961fdb005 (diff)
parentc6ac64ed2dc4b7a3562d15d030ce3b7f76f941dc (diff)
downloadslixmpp-f09adf00142a96d8537f1dbab09db708f1298452.tar.gz
slixmpp-f09adf00142a96d8537f1dbab09db708f1298452.tar.bz2
slixmpp-f09adf00142a96d8537f1dbab09db708f1298452.tar.xz
slixmpp-f09adf00142a96d8537f1dbab09db708f1298452.zip
Merge branch 'master' into develop
Diffstat (limited to 'docs/event_index.rst')
0 files changed, 0 insertions, 0 deletions