diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-03-12 21:21:32 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-03-12 21:21:32 +0100 |
| commit | 86afdc7aaff4ed6fa37e6d5fd9e5ffab20375f21 (patch) | |
| tree | c8cf7dccc382d7492fa54d3fac5be76923555750 /src/main/java/eu/siacs/conversations/utils | |
| parent | dc26c95b40c3d0f48ed539f91e53c1bff1dceec6 (diff) | |
| parent | 14c2c72bc1a00c8b9839047cdc73116e561ecd62 (diff) | |
Merge commit 'remotes/origin/trz/rename~1' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/utils')
0 files changed, 0 insertions, 0 deletions