Merge branch 'develop' into feature/expanding_toolbar

2b05d0b6 · Grigory Fedorov · 2e922c76 · daf81411 · 2b05d0b6 · 2e922c76
Commit 2b05d0b6 authored Mar 13, 2015 by Grigory Fedorov
8 changed files
--- a/app/src/main/res/drawable-hdpi/chat_background.jpg
+++ b/app/src/main/res/drawable-hdpi/chat_background.jpg
--- a/app/src/main/res/drawable-hdpi/chat_background.png
+++ b/app/src/main/res/drawable-hdpi/chat_background.png
--- a/app/src/main/res/drawable-mdpi/chat_background.jpg
+++ b/app/src/main/res/drawable-mdpi/chat_background.jpg
--- a/app/src/main/res/drawable-mdpi/chat_background.png
+++ b/app/src/main/res/drawable-mdpi/chat_background.png
--- a/app/src/main/res/drawable-xhdpi/chat_background.jpg
+++ b/app/src/main/res/drawable-xhdpi/chat_background.jpg
--- a/app/src/main/res/drawable-xhdpi/chat_background.png
+++ b/app/src/main/res/drawable-xhdpi/chat_background.png
--- a/app/src/main/res/drawable-xxhdpi/chat_background.jpg
+++ b/app/src/main/res/drawable-xxhdpi/chat_background.jpg
--- a/app/src/main/res/drawable-xxhdpi/chat_background.png
+++ b/app/src/main/res/drawable-xxhdpi/chat_background.png