diff options
| author | steckbrief <steckbrief@chefmail.de> | 2015-04-11 23:00:31 +0200 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2015-04-11 23:00:31 +0200 |
| commit | deac0df707099ef7ef6bd2420eb1df13a5a83ca1 (patch) | |
| tree | 8b087218ad07c5511fe159dbafd5b4be64d23ce1 /src/main/java/eu/siacs/conversations/entities/DownloadablePlaceholder.java | |
| parent | 17779e77002e99dabb73f4fa8f9596e9d220319b (diff) | |
| parent | 82bfd8ac335b84613677ff857cf27c455fdf512d (diff) | |
Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into trz/master
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities/DownloadablePlaceholder.java')
0 files changed, 0 insertions, 0 deletions