aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-11-03 20:28:58 +0100
committeriNPUTmice <daniel@gultsch.de>2014-11-03 20:28:58 +0100
commitc48407f3b4c5b2984fcdc33d9fce7a55ea0e94b9 (patch)
tree67796bf64e4bf2236fb3422d78d5513214a0f234 /src/main
parentec9c264cf757f0dd78991f72ebf54164bad12995 (diff)
parente496a5409bac5a5090ceda51fe8c09493b010f15 (diff)
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'src/main')
-rw-r--r--src/main/res/layout/activity_contact_details.xml3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index f7cb2198c..2b94e6f67 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -63,7 +63,6 @@
android:id="@+id/details_lastseen"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:singleLine="true"
android:textColor="@color/secondarytext"
android:textSize="?attr/TextSizeBody" />
</LinearLayout>
@@ -111,4 +110,4 @@
</LinearLayout>
</LinearLayout>
-</ScrollView> \ No newline at end of file
+</ScrollView>