summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2013-01-16 23:37:05 -0800
committerLance Stout <lancestout@gmail.com>2013-01-16 23:37:05 -0800
commit648f3f978a84445ed188be055453ac4cab3ed4f5 (patch)
tree716dfb25fbbcbdbe970a6133e4cdda03f8f93223 /docs
parent64ef6904320d6dd4dbdf4f9418a1dd054163899a (diff)
parent5e4b8bd67c25d670d406198c6b14a432ccb99239 (diff)
downloadslixmpp-648f3f978a84445ed188be055453ac4cab3ed4f5.tar.gz
slixmpp-648f3f978a84445ed188be055453ac4cab3ed4f5.tar.bz2
slixmpp-648f3f978a84445ed188be055453ac4cab3ed4f5.tar.xz
slixmpp-648f3f978a84445ed188be055453ac4cab3ed4f5.zip
Merge branch 'master' into develop
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions