projects / profile / mobile / apps / native / message.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4dc3caa e3217e3)
Merge branch 'tizen' into tizen_dev 83/77683/1
authorAndrey Klimenko <and.klimenko@samsung.com>
Thu, 30 Jun 2016 12:40:08 +0000 (15:40 +0300)
committerAndrey Klimenko <and.klimenko@samsung.com>
Thu, 30 Jun 2016 12:40:08 +0000 (15:40 +0300)
Signed-off-by: Andrey Klimenko <and.klimenko@samsung.com>
Conflicts:
src/Conversation/Utils/src/MessageDetailContent.cpp

Change-Id: I161db5abce2cd81cbf3881352586e1249418a60f


Trivial merge
Domain: Applications / Communication;