From 24fd10d3b75f8fbb2fa5376f35a10bd345b0ff1d Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Thu, 28 Mar 2019 21:11:18 +0100
Subject: [PATCH] add Conscrypt to LicenseActivity (#1161)

* add Conscrypt and AutoDispose to LicenseActivity

* remove duplicate AutoDispose again D:
---
 app/src/main/res/layout/activity_license.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/src/main/res/layout/activity_license.xml b/app/src/main/res/layout/activity_license.xml
index 5dc30871..0dc11406 100644
--- a/app/src/main/res/layout/activity_license.xml
+++ b/app/src/main/res/layout/activity_license.xml
@@ -62,6 +62,16 @@
                 license:link="https://square.github.io/okhttp/"
                 license:name="OkHttp" />
 
+            <com.keylesspalace.tusky.view.LicenseCard
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="12dp"
+                android:layout_marginStart="12dp"
+                android:layout_marginTop="12dp"
+                license:license="@string/license_apache_2"
+                license:link="https://github.com/google/conscrypt"
+                license:name="Conscrypt" />
+
             <com.keylesspalace.tusky.view.LicenseCard
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"