aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/XmppActivity.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* fixed nfc. react to ?join uris. some refactoring. code cleanup. thanks to @em...iNPUTmice2014-11-031-0/+10
|\
| * basic beam code / untestediNPUTmice2014-11-031-0/+8
|/
* Merge branch 'gradle' into developmentSam Whited2014-10-301-4/+15
* Make conversations the root projectSam Whited2014-10-221-0/+637