diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-01-14 20:19:19 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-01-14 20:19:19 +0100 |
| commit | d9af7dca5475866a0b41c1328b1ce0dc8866c24f (patch) | |
| tree | e5bd245554a66192788ab5c224635820dadb3158 /src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java | |
| parent | 7e44ff92d7d9094207d0a0b1639a88c5fd6e8ccc (diff) | |
| parent | 203d72e9630d210a613766be0d908f4785546320 (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java')
0 files changed, 0 insertions, 0 deletions