aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/layout/message_received.xml (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merged 1.5.2 into trz/master with conflicts resolvedsteckbrief2015-08-111-5/+4
|\
| * fixed some ux glitches in editaccountDaniel Gultsch2015-07-161-1/+0
| * renamed colorsDaniel Gultsch2015-07-131-4/+4
* | whatsapp-like smiley implementationlookshe2015-04-121-3/+6
|/
* Merge branch 'gradle' into developmentSam Whited2014-10-301-2/+2
* Make conversations the root projectSam Whited2014-10-221-0/+97