summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-10-14 17:35:37 -0700
committerLance Stout <lancestout@gmail.com>2012-10-14 17:35:37 -0700
commit7c485c6a8b25b97c7faa4abda6e82200bd09bcae (patch)
treea1f09f31f4bdd2cf8c5bc438fefcc1b3f37a861c /docs
parentfc07e23ff8f2eb7c67a1dfeae0db67b182144fca (diff)
parente2e8c4b5dcca3dddfda6e60850a6754018e8f60d (diff)
downloadslixmpp-7c485c6a8b25b97c7faa4abda6e82200bd09bcae.tar.gz
slixmpp-7c485c6a8b25b97c7faa4abda6e82200bd09bcae.tar.bz2
slixmpp-7c485c6a8b25b97c7faa4abda6e82200bd09bcae.tar.xz
slixmpp-7c485c6a8b25b97c7faa4abda6e82200bd09bcae.zip
Merge branch 'master' into develop
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions