summaryrefslogtreecommitdiff
path: root/sleekxmpp/features/__init__.py
diff options
context:
space:
mode:
authorJean-Philippe Caruana <jp@barreverte.fr>2013-07-30 18:02:03 +0200
committerJean-Philippe Caruana <jp@barreverte.fr>2013-07-30 18:02:03 +0200
commit88e64dbfae71b4518459b7997c0a6e70d2e48e11 (patch)
tree1d61902dec91c31fd79dde8c6f48c595f52af2c2 /sleekxmpp/features/__init__.py
parentdb0ab9a0b377d33d2975b45f2368ea0197b4ed1c (diff)
parentafd48b9e08c1b823c48c35c12c25dd3acadc4dcd (diff)
downloadslixmpp-88e64dbfae71b4518459b7997c0a6e70d2e48e11.tar.gz
slixmpp-88e64dbfae71b4518459b7997c0a6e70d2e48e11.tar.bz2
slixmpp-88e64dbfae71b4518459b7997c0a6e70d2e48e11.tar.xz
slixmpp-88e64dbfae71b4518459b7997c0a6e70d2e48e11.zip
Merge remote-tracking branch 'upstream/develop' into develop
Diffstat (limited to 'sleekxmpp/features/__init__.py')
0 files changed, 0 insertions, 0 deletions