diff options
| author | lookshe <github@lookshe.org> | 2016-03-23 13:17:45 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-03-23 13:17:45 +0100 |
| commit | f3bebf59278f835ba928a498e76b76f7f65ee95a (patch) | |
| tree | 9ea9731e67e39ae601d8e3805d9193533f8159f1 /src/main/java/eu/siacs/conversations/xmpp/jingle | |
| parent | 4085f2a80e00e24a73206389cb1e8f30385e9952 (diff) | |
| parent | 977ffc5f483e955857da1d56ce0a1c857d471175 (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