diff options
author | Christian S <christian@pix-art.de> | 2015-08-15 19:44:48 +0200 |
---|---|---|
committer | Christian S <christian@pix-art.de> | 2015-08-15 19:44:48 +0200 |
commit | f4a2e4f2ce9361cadbd7ef96c45a90d9b29626d4 (patch) | |
tree | 08ae5551a3ff21ced678e2aa1e62800af5785639 /src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java | |
parent | a118cb0e5ee7859aee683f1c49ac125848798cc4 (diff) | |
parent | d4177adebfdd009b6adbcc3a08646f3ddf3e0b09 (diff) |
Merge branch 'master' of https://github.com/kriztan/Conversations
Diffstat (limited to 'src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java')
0 files changed, 0 insertions, 0 deletions