diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-03-30 22:57:17 +0200 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-03-30 22:57:17 +0200 |
| commit | 933905767c1dd647fcef93ebc0e8b47cfb93483d (patch) | |
| tree | 38f53421cf10b5de6840bdcaf70a2d76f360b6c8 /src/main/java/eu/siacs/conversations/entities | |
| parent | a8f667e11fdf801a1bdb7f6977440d1da5edb4fd (diff) | |
| parent | 7c0c1b7e495c732772bec0f650facd08b1f69420 (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities')
0 files changed, 0 insertions, 0 deletions