aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/layout
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2016-05-29 10:09:48 +0200
committerChristian Schneppe <christian@pix-art.de>2016-05-29 10:09:48 +0200
commit04ceeec4b302a23f14d73e4d6e479ebf28145c8e (patch)
treefb537bca00a09b672fb1449f58c7d31b4dc9da60 /src/main/res/layout
parent35bf89e154ed7ac26e538fb908a96fc99e9b441d (diff)
parent2c55954ddda1d84a32150b430fe80ff8084612a1 (diff)
Merge remote-tracking branch 'refs/remotes/siacs/master'
Diffstat (limited to 'src/main/res/layout')
-rw-r--r--src/main/res/layout/message_received.xml1
-rw-r--r--src/main/res/layout/message_sent.xml1
2 files changed, 0 insertions, 2 deletions
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 19df7c091..19bb83206 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -61,7 +61,6 @@
android:autoLink="web"
android:textColorLink="@color/dark"
android:textColor="@color/dark"
- android:maxLines="256"
android:textColorHighlight="@color/grey800"
android:textSize="?attr/TextSizeBody" />
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 42cdc95a7..ee8d38e49 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -62,7 +62,6 @@
android:autoLink="web"
android:textColorLink="@color/black54"
android:textColor="@color/black54"
- android:maxLines="256"
android:textColorHighlight="@color/grey500"
android:textSize="?attr/TextSizeBody" />