aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/persistance/OnPhoneContactsMerged.java (unfollow)
Commit message (Collapse)AuthorFilesLines
2016-07-29changed package id inside manifest and projectChristian Schneppe1-5/+0
2014-10-22Make conversations the root projectSam Whited1-0/+0