summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2013-09-05 16:26:18 -0700
committerLance Stout <lancestout@gmail.com>2013-09-05 16:26:18 -0700
commit24c474a9ec018448846756b33716e5ed973bcdf6 (patch)
tree98c39075cd31f0cc6f0f7a6955c5fb8273436e7a /LICENSE
parent6c2fa7a3823e223d59c19e75b89ad86efb544d23 (diff)
parent8fd3781ef5de85dbec6166d079a579c1374090ec (diff)
downloadslixmpp-24c474a9ec018448846756b33716e5ed973bcdf6.tar.gz
slixmpp-24c474a9ec018448846756b33716e5ed973bcdf6.tar.bz2
slixmpp-24c474a9ec018448846756b33716e5ed973bcdf6.tar.xz
slixmpp-24c474a9ec018448846756b33716e5ed973bcdf6.zip
Merge branch 'xep_0323_325' of git://github.com/joachimlindborg/SleekXMPP into joachimlindborg-xep_0323_325
Conflicts: sleekxmpp/plugins/__init__.py
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions