aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/entities/Presences.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'siacs/master' into developmentChristian S2015-10-311-1/+1
|\
| * Don't synchronize on non-final fieldSam Whited2015-10-261-1/+1
* | show resource in dynamic tagshlad2015-10-221-0/+15
|/
* made presences synchronizediNPUTmice2014-11-131-13/+27
* Make conversations the root projectSam Whited2014-10-221-0/+76