diff options
| author | Lance Stout <lancestout@gmail.com> | 2013-01-04 03:00:43 -0800 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2013-01-04 03:00:43 -0800 |
| commit | 0e7486d7b49fb3f3c6e573ac972dfadc03c7ca08 (patch) | |
| tree | 74f47de958471c492a7d12afe1e59729a52e3909 /tox.ini | |
| parent | ef76f923ad885d8faa67e88d76704cbe8253b153 (diff) | |
| parent | 6c0afb87b919f1f0321146323e917480851b2d63 (diff) | |
| download | slixmpp-0e7486d7b49fb3f3c6e573ac972dfadc03c7ca08.tar.gz slixmpp-0e7486d7b49fb3f3c6e573ac972dfadc03c7ca08.tar.bz2 slixmpp-0e7486d7b49fb3f3c6e573ac972dfadc03c7ca08.tar.xz slixmpp-0e7486d7b49fb3f3c6e573ac972dfadc03c7ca08.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions