aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/entities/Transferable.java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'development' of https://github.com/siacs/Conversations into ↵Christian S2015-07-141-1/+1
| | | | siacs-development
* renamed downloadable to transferableDaniel Gultsch2015-07-101-0/+28