aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack/conversationsplus/services/ContactChooserTargetService.java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'trz/rebase' into trz/renamelookshe2016-04-171-1/+1
| | | | | | | | | | | | | | | | Conflicts: build.gradle src/main/java/de/thedevstack/conversationsplus/services/AvatarService.java src/main/res/values-bg/strings.xml src/main/res/values-cs/strings.xml src/main/res/values-fr/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pt/strings.xml src/main/res/values-ro-rRO/strings.xml src/main/res/values-sv/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/strings.xml
* Merge branch 'trz/rebase' into trz/renamelookshe2016-03-061-0/+83