aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/Config.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* made emoticon parsing enableable - default falseiNPUTmice2014-09-031-0/+2
* improvements for merge conditionsiNPUTmice2014-08-311-0/+2
* some code cleanupiNPUTmice2014-08-311-0/+21