aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/entities/Transferable.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* reformated codeChristian S2016-03-051-64/+64
* Merge branch 'siacs/master' into developmentChristian S2016-03-051-53/+54
|\
| * add a few more know file extensionsDaniel Gultsch2016-03-041-3/+6
| * added mp4 to well known extensions. fixes #1403Daniel Gultsch2015-09-121-1/+1
* | added 'ics' to well-known extentionsChristian S.2015-08-151-1/+3
* | added one more well-known file typeChristian S2015-08-081-0/+1
* | added more well known file typesChristian S2015-07-231-3/+49
* | Merge branch 'development' of https://github.com/siacs/Conversations into sia...Christian S2015-07-141-1/+1
|/
* renamed downloadable to transferableDaniel Gultsch2015-07-101-0/+28