diff options
| author | steckbrief <steckbrief@chefmail.de> | 2015-10-23 22:26:55 +0200 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2015-10-23 22:26:55 +0200 |
| commit | 389e3d4f0f5116f5ea22cc7c5e8cec1e6c791e3a (patch) | |
| tree | de9aad5a69444199fccef87f81709bde5a7689b3 /src/main/java/eu/siacs/conversations/persistance/OnPhoneContactsMerged.java | |
| parent | bdc211a67a25298eb05854ff7e98461223e21bc5 (diff) | |
| parent | 7aed735df28984e76486f23d17d02981b268930e (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/persistance/OnPhoneContactsMerged.java')
0 files changed, 0 insertions, 0 deletions