diff options
author | lookshe <github@lookshe.org> | 2016-03-20 16:15:43 +0100 |
---|---|---|
committer | lookshe <github@lookshe.org> | 2016-03-20 16:15:43 +0100 |
commit | d1e2023bd9b64d405af9648635ca17f0a7ff1010 (patch) | |
tree | 26741b1cd11ba167ec06b163738d9b7097ef76d9 /src/main/java/eu/siacs/conversations/xmpp/stanzas/csi | |
parent | 50dad467eeb63e767777733e9b280864f16e81f7 (diff) | |
parent | 90bbe035e9efdff72241c8a0d87000fdba482a6b (diff) |
Merge branch 'trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/xmpp/stanzas/csi')
0 files changed, 0 insertions, 0 deletions