diff options
| author | lookshe <github@lookshe.org> | 2016-03-21 03:12:34 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-03-21 03:12:34 +0100 |
| commit | de3894f77c58579608fbe116c2dc5f36dcecbc8f (patch) | |
| tree | 5a35731992f7087ac573e57fe88d3adb50da0d9a /src/main/java/eu/siacs/conversations/xmpp | |
| parent | dd8dac73d2564075f662df03892228a887fa1099 (diff) | |
| parent | 47b982524e21ac3a58d742092943eef3e8edb7e1 (diff) | |
Merge branch 'trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/xmpp')
0 files changed, 0 insertions, 0 deletions