diff options
| author | lookshe <github@lookshe.org> | 2016-03-07 14:24:07 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-03-07 14:24:07 +0100 |
| commit | d620dcdc575ff1ce4cbdaf78e3182f3418e2142d (patch) | |
| tree | 3c04a4d19952bbe9398b8276e685580592c801de /src/main/java/de/thedevstack/conversationsplus/xmpp/jingle | |
| parent | e9536210d7ba94d08067c2ace73c2a5f6d3c36e0 (diff) | |
| parent | 739ae021068f543aa0fca2d2d9977461f7633560 (diff) | |
Merge branch 'trz/rebase' into trz/rename
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/xmpp/jingle')
0 files changed, 0 insertions, 0 deletions