aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* | unfinishd qr code implemenation. thanks to @emdeteiNPUTmice2014-11-031-2/+23
|/
* Merge branch 'gradle' into developmentSam Whited2014-10-301-3/+3
* Make conversations the root projectSam Whited2014-10-221-0/+677