From 8fd688ca96005152be754eeba1be72c7c0aab9ad Mon Sep 17 00:00:00 2001
From: lookshe <github@lookshe.org>
Date: Tue, 11 Aug 2015 17:35:53 +0200
Subject: Merge tag '1.5.2' into trz/rebase

---
 src/main/res/layout/activity_about.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/res/layout/activity_about.xml')

diff --git a/src/main/res/layout/activity_about.xml b/src/main/res/layout/activity_about.xml
index ab0e34eb..d7d23f0f 100644
--- a/src/main/res/layout/activity_about.xml
+++ b/src/main/res/layout/activity_about.xml
@@ -1,7 +1,7 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     tools:context="eu.siacs.conversations.ui.AboutActivity"
-    android:background="@color/primarybackground"
+    android:background="@color/grey50"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
 
@@ -15,7 +15,7 @@
         android:layout_marginRight="@dimen/activity_horizontal_margin"
         android:layout_marginTop="@dimen/activity_vertical_margin"
         android:paddingBottom="@dimen/activity_vertical_margin"
-        android:textColor="@color/primarytext"
+        android:textColor="@color/black87"
         android:textSize="?attr/TextSizeBody"
         android:typeface="monospace"/>
 </ScrollView>
-- 
cgit v1.2.3