diff options
| author | steckbrief <steckbrief@chefmail.de> | 2017-01-05 20:17:12 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2017-01-05 20:17:12 +0100 |
| commit | c9ae205490bc644e01fb38611406b4f91c4d2f6b (patch) | |
| tree | 3ca307f2fe81974b97c9710efcb977fa076ab906 /src/main/java/de/thedevstack/conversationsplus/xmpp/jingle | |
| parent | 28676d3048eaf52260101cf6390c12479192e892 (diff) | |
| parent | 93c3c723a9f7411087125b802badd788484ee6fb (diff) | |
Merge remote-tracking branch 'origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/xmpp/jingle')
0 files changed, 0 insertions, 0 deletions