diff options
| author | Robert Robinson <rerobins@gmail.com> | 2015-09-18 13:35:28 -0600 |
|---|---|---|
| committer | Robert Robinson <rerobins@gmail.com> | 2015-09-18 13:35:28 -0600 |
| commit | c2dc44cfd17d24f7737113efb4e0e9cab5d7d09f (patch) | |
| tree | d7a08ff192eac6e341e66891a0ded70ebd0e238f /tests/test_stream_xep_0085.py | |
| parent | 5fc14de32e7fbd4e33a0e1ed92d8fb23871a2a2d (diff) | |
| parent | ffb2b6bc0464a9646d4b4bca3943d3a89dfc13a6 (diff) | |
| download | slixmpp-c2dc44cfd17d24f7737113efb4e0e9cab5d7d09f.tar.gz slixmpp-c2dc44cfd17d24f7737113efb4e0e9cab5d7d09f.tar.bz2 slixmpp-c2dc44cfd17d24f7737113efb4e0e9cab5d7d09f.tar.xz slixmpp-c2dc44cfd17d24f7737113efb4e0e9cab5d7d09f.zip | |
Merge branch 'develop' into xep_0050_updates
# Conflicts:
# tests/test_stream_xep_0050.py
Diffstat (limited to 'tests/test_stream_xep_0085.py')
0 files changed, 0 insertions, 0 deletions