diff options
| author | lookshe <github@lookshe.org> | 2016-03-23 13:41:58 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-03-23 13:41:58 +0100 |
| commit | 86d16b030b46aca24e6fab38e5d34beb503a6dc7 (patch) | |
| tree | 0ec47c54eba09753d45ed049f75c6fce7b1a1b2b /src/main/java/eu/siacs/conversations | |
| parent | f3bebf59278f835ba928a498e76b76f7f65ee95a (diff) | |
| parent | f306292ed68c003621b53065dd70e499e074e748 (diff) | |
Merge branch 'trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations')
0 files changed, 0 insertions, 0 deletions