diff options
| author | lookshe <github@lookshe.org> | 2016-03-22 00:58:52 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-03-22 00:58:52 +0100 |
| commit | 4085f2a80e00e24a73206389cb1e8f30385e9952 (patch) | |
| tree | 2cb25205f26167d69b02b6efa6d500dbd4c34564 /src/main/java/eu/siacs/conversations/xmpp/jingle/JingleTransport.java | |
| parent | de3894f77c58579608fbe116c2dc5f36dcecbc8f (diff) | |
| parent | 02f958ce7687eeff0eaae7da372bad4b65f78596 (diff) | |
Merge branch 'trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/xmpp/jingle/JingleTransport.java')
0 files changed, 0 insertions, 0 deletions