summaryrefslogtreecommitdiff
path: root/README.rst
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2013-01-04 03:00:43 -0800
committerLance Stout <lancestout@gmail.com>2013-01-04 03:00:43 -0800
commit0e7486d7b49fb3f3c6e573ac972dfadc03c7ca08 (patch)
tree74f47de958471c492a7d12afe1e59729a52e3909 /README.rst
parentef76f923ad885d8faa67e88d76704cbe8253b153 (diff)
parent6c0afb87b919f1f0321146323e917480851b2d63 (diff)
downloadslixmpp-0e7486d7b49fb3f3c6e573ac972dfadc03c7ca08.tar.gz
slixmpp-0e7486d7b49fb3f3c6e573ac972dfadc03c7ca08.tar.bz2
slixmpp-0e7486d7b49fb3f3c6e573ac972dfadc03c7ca08.tar.xz
slixmpp-0e7486d7b49fb3f3c6e573ac972dfadc03c7ca08.zip
Merge branch 'master' into develop
Diffstat (limited to 'README.rst')
0 files changed, 0 insertions, 0 deletions