diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-03-28 23:20:44 +0200 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-03-28 23:20:44 +0200 |
| commit | 77b1f2138e19545a48ea93c97f8518a87b065831 (patch) | |
| tree | 8e27fefdbe9b16991f2450f147aeee581337ec1b /src/main/java/eu/siacs/conversations/entities/Contact.java | |
| parent | 27ca7f72d158318076de59d60ccb28625f3bdbf7 (diff) | |
| parent | 0c0676b7dbf87e24ebcc4714adfb10d91e3d72b8 (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities/Contact.java')
0 files changed, 0 insertions, 0 deletions