diff options
| author | bear (Mike Taylor) <bear@andyet.net> | 2015-04-11 20:43:56 -0400 |
|---|---|---|
| committer | bear (Mike Taylor) <bear@andyet.net> | 2015-04-11 20:43:56 -0400 |
| commit | 1bbb6f3ff9af2ca7b2a9ff87b6af9aef3d31b1e6 (patch) | |
| tree | a3bbbde70768a1265ed95d23ecca2a67e2014b46 /sleekxmpp/plugins/xep_0079/amp.py | |
| parent | 16bb5e2537d0bffe4c561fa97be8adb12110d41f (diff) | |
| parent | 93894247a46f187a08e69fba6a68d26e382bc777 (diff) | |
| download | slixmpp-1bbb6f3ff9af2ca7b2a9ff87b6af9aef3d31b1e6.tar.gz slixmpp-1bbb6f3ff9af2ca7b2a9ff87b6af9aef3d31b1e6.tar.bz2 slixmpp-1bbb6f3ff9af2ca7b2a9ff87b6af9aef3d31b1e6.tar.xz slixmpp-1bbb6f3ff9af2ca7b2a9ff87b6af9aef3d31b1e6.zip | |
Merge branch 'hildjj-develop' into develop
Diffstat (limited to 'sleekxmpp/plugins/xep_0079/amp.py')
0 files changed, 0 insertions, 0 deletions