summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-08-02 13:47:37 -0700
committerLance Stout <lancestout@gmail.com>2012-08-02 13:47:37 -0700
commitf81d5e4bd656fb64dd7f4285afa26e452a869a63 (patch)
treede758a6cbc60032ce40351dacda68588fab432ff /tox.ini
parent2f65fdbc76e46a3468d46bec7f2655a053cb5039 (diff)
parent2324c90232aa7815f130761f1215704b391415fb (diff)
downloadslixmpp-f81d5e4bd656fb64dd7f4285afa26e452a869a63.tar.gz
slixmpp-f81d5e4bd656fb64dd7f4285afa26e452a869a63.tar.bz2
slixmpp-f81d5e4bd656fb64dd7f4285afa26e452a869a63.tar.xz
slixmpp-f81d5e4bd656fb64dd7f4285afa26e452a869a63.zip
Merge branch 'master' into develop
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions