aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge master-originsteckbrief2015-02-201-0/+9
|\
| * adapt caps on whether or not message confirmation is oniNPUTmice2015-01-261-0/+8
* | - Avoiding accessing shared preferences to know if emoticons should be parsed...steckbrief2015-01-201-14/+19
|/
* remove unused imports.Michael2014-11-211-1/+0
* turn on foreground service in expert settingsiNPUTmice2014-11-151-0/+2
* It builds again!Sam Whited2014-11-091-2/+4
* Make conversations the root projectSam Whited2014-10-221-0/+74