diff options
| author | steckbrief <steckbrief@chefmail.de> | 2015-12-16 21:55:02 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2015-12-16 21:55:02 +0100 |
| commit | 4f0061293e1d8e90d2828deeb6b72d8a2c8bd509 (patch) | |
| tree | a365b75f1d8cd49639b0e6b597aeb48ea82b1773 /src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java | |
| parent | f49b979cbe96a81c7f20f209bec7e5a1c9f3c24f (diff) | |
| parent | c26335f3e366110366eb89025a42875bcb7840a9 (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