aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* be more OOM. Dietrich2014-11-041-51/+44
* support pre JELLY_BEAN ndefM. Dietrich2014-11-041-16/+24
* fixed nfc. react to ?join uris. some refactoring. code cleanup. thanks to @em...iNPUTmice2014-11-031-59/+136
|\
| * basic beam code / untestediNPUTmice2014-11-031-21/+54
* | 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