summaryrefslogtreecommitdiff
path: root/docs/license.rst
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-10-24 01:23:08 -0700
committerLance Stout <lancestout@gmail.com>2012-10-24 01:23:08 -0700
commit931d49560a1ebf3b767d20f8aeb692dd30a518c3 (patch)
tree8584d849a450aabaac5cebd08245f2d6a47e6c0c /docs/license.rst
parent3655827ef2e268e9ab327e4a6c788c3e336146e0 (diff)
parent2a4e4352282e393e2843bc8d4c5847d7351ef34c (diff)
downloadslixmpp-931d49560a1ebf3b767d20f8aeb692dd30a518c3.tar.gz
slixmpp-931d49560a1ebf3b767d20f8aeb692dd30a518c3.tar.bz2
slixmpp-931d49560a1ebf3b767d20f8aeb692dd30a518c3.tar.xz
slixmpp-931d49560a1ebf3b767d20f8aeb692dd30a518c3.zip
Merge branch 'master' into develop
Diffstat (limited to 'docs/license.rst')
0 files changed, 0 insertions, 0 deletions