diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-02-28 21:48:09 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-02-28 21:48:09 +0100 |
| commit | cd0c6ce48e2ac36d9524908acbbc79690b193d9a (patch) | |
| tree | e03621214377147d44a13917485baf16b607a11a /src/main/res/drawable-xxhdpi/ic_block_white_24dp.png | |
| parent | 8fb6204288d55f8af16ae47e32fa6c049284cadd (diff) | |
| parent | c393e6089177f31683c4cecfdb359802de1b5e0c (diff) | |
Merge tag '1.10.1' into trz/merge_1.10.1
Conflicts:
README.md
build.gradle
src/main/java/eu/siacs/conversations/entities/ListItem.java
src/main/java/eu/siacs/conversations/parser/MessageParser.java
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
src/main/res/menu/message_context.xml
src/main/res/xml/preferences.xml
Diffstat (limited to 'src/main/res/drawable-xxhdpi/ic_block_white_24dp.png')
0 files changed, 0 insertions, 0 deletions