aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/persistance/OnPhoneContactsMerged.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Make conversations the root projectSam Whited2014-10-221-0/+5