diff options
| author | steckbrief <steckbrief@chefmail.de> | 2015-12-06 16:21:39 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2015-12-06 16:21:39 +0100 |
| commit | aa6a2e1c182858e7bcc077f5220546e08df12ec1 (patch) | |
| tree | 12cce9117bfa7bda7dc78b9809f772e0439fc7c7 /src/main/java/eu/siacs/conversations/entities/TransferablePlaceholder.java | |
| parent | 734511b0fa15fa6ceb88c6b0ab4791139f7ffc8d (diff) | |
| parent | eb5a7a5392ec93976d91d5576a3496ceac473d03 (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities/TransferablePlaceholder.java')
0 files changed, 0 insertions, 0 deletions