diff options
author | steckbrief <steckbrief@chefmail.de> | 2016-04-06 22:47:48 +0200 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2016-04-06 22:47:48 +0200 |
commit | b55ce9ee90533eb7762ad11ea7b22193cbd94ed5 (patch) | |
tree | 71e6572c74b156b1cf8a8ff1c0042c75e04b7694 /src/main/java/eu/siacs/conversations | |
parent | aa9b5036d26f27b9d1f0c8bacd934b5d5dd09137 (diff) | |
parent | 1e1f7f419ecbe9db44acb84fd06c7b889d1af475 (diff) |
Merge commit 'remotes/origin/trz/rename~1' into trz/rebase
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions