summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-01-18 15:31:45 -0800
committerLance Stout <lancestout@gmail.com>2012-01-18 15:31:45 -0800
commit79b71228c1659f4127f4c151859f8a8c22838147 (patch)
tree0a9caa7ff32a45a3d83b4a5463659e7bc00435b7 /sleekxmpp/plugins
parent738ec92b8ea6175f20d81e356e5dc76bff1559c4 (diff)
downloadslixmpp-79b71228c1659f4127f4c151859f8a8c22838147.tar.gz
slixmpp-79b71228c1659f4127f4c151859f8a8c22838147.tar.bz2
slixmpp-79b71228c1659f4127f4c151859f8a8c22838147.tar.xz
slixmpp-79b71228c1659f4127f4c151859f8a8c22838147.zip
Fix some more merge conflicts.
Diffstat (limited to 'sleekxmpp/plugins')
0 files changed, 0 insertions, 0 deletions