aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* basic beam code / untestediNPUTmice2014-11-031-106/+125
* Merge branch 'gradle' into developmentSam Whited2014-10-301-35/+24
* Make conversations the root projectSam Whited2014-10-221-0/+947