diff options
| author | steckbrief <steckbrief@chefmail.de> | 2015-12-04 19:57:46 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2015-12-04 19:57:46 +0100 |
| commit | 9265d6718e83e2d8d29809cbec4f8fb1f3a29960 (patch) | |
| tree | bbaba52f2371db74c1dd0893f881a85d18df419e /src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Content.java | |
| parent | ca0d68224ec804cac739ed955390aa7f6a585856 (diff) | |
| parent | 909dac7ac2bd2e76b2514a7bc6044e918abdf13f (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Content.java')
0 files changed, 0 insertions, 0 deletions