aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/Config.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* cleanup: removed unused emoticon parsingiNPUTmice2014-12-091-1/+0
* progress for ibb transfersiNPUTmice2014-11-151-0/+2
* support for pgp filesiNPUTmice2014-11-151-1/+1
* progress for http images as well. fixed open button for sent filesiNPUTmice2014-11-151-0/+1
* Merge branch 'gradle' into developmentSam Whited2014-10-301-0/+1
* Make conversations the root projectSam Whited2014-10-221-0/+25