diff options
| author | lookshe <github@lookshe.org> | 2016-03-20 17:37:44 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-03-20 17:37:44 +0100 |
| commit | a8db6be4eb932bfa54efb0bf50266c4167a32004 (patch) | |
| tree | 97f49fc6363e92e0fccb85b65a081a13733b3151 /src/main/java/eu/siacs/conversations/xmpp/jingle | |
| parent | d1e2023bd9b64d405af9648635ca17f0a7ff1010 (diff) | |
| parent | ea6564c81a23c10bcdabeba7e29211e97c444d5b (diff) | |
Merge branch 'trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/xmpp/jingle')
0 files changed, 0 insertions, 0 deletions