diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2014-09-04 10:28:13 +0200 |
---|---|---|
committer | Daniel Gultsch <daniel@gultsch.de> | 2014-09-04 10:28:13 +0200 |
commit | 1d6c09e8ffd68bca5c3a51ea21684f1c91bde7de (patch) | |
tree | f689c7188f284df7d6fda4867535eb47fc429b0b /src/eu/siacs/conversations/xmpp/jingle/JingleFile.java | |
parent | 50f90d37b8a873a523da9bfcafdd3984451f9549 (diff) | |
parent | 5b24534ab6a0ee6ff0d54ccfd9c16b795ead44a3 (diff) |
Merge pull request #397 from GZep/development
XEP-0172
Diffstat (limited to 'src/eu/siacs/conversations/xmpp/jingle/JingleFile.java')
0 files changed, 0 insertions, 0 deletions