aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/entities/TransferablePlaceholder.java (unfollow)
Commit message (Expand)AuthorFilesLines
2015-08-11Merge tag '1.5.2' into trz/rebaselookshe1-7/+2
2014-11-15fixed description in notifications and conversation overviewiNPUTmice1-0/+39