diff options
author | lookshe <github@lookshe.org> | 2015-08-16 18:45:08 +0200 |
---|---|---|
committer | lookshe <github@lookshe.org> | 2015-08-16 18:45:08 +0200 |
commit | 89b28a496542b1995f60efb6b8937d11adf8e425 (patch) | |
tree | 2039e26dd5d3fdd8ce3ce277ff1bff8324f32f6e /libs/emojicon/src/main/res/drawable/emo_im_embarrassed.png | |
parent | a76de90fe7a53220e9358d38fa7b47b63f7694fe (diff) | |
parent | 0321ebb7a6785b4673376f9e6458e41dd96b2230 (diff) |
Merge branch 'trz/rebase' into trz/rename
Conflicts:
src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java
src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java
Diffstat (limited to '')
-rw-r--r-- | libs/emojicon/src/main/res/drawable/emo_im_embarrassed.png (renamed from src/main/res/drawable/emo_im_embarrassed.png) | bin | 3619 -> 3619 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/src/main/res/drawable/emo_im_embarrassed.png b/libs/emojicon/src/main/res/drawable/emo_im_embarrassed.png Binary files differindex e4db9634..e4db9634 100644 --- a/src/main/res/drawable/emo_im_embarrassed.png +++ b/libs/emojicon/src/main/res/drawable/emo_im_embarrassed.png |