From 1de4dc4f90ccbb1468ae54fafb086771f009023b Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 19 Sep 2018 07:58:36 +0000
Subject: [PATCH] 0.61 release

---
 .idea/assetWizardSettings.xml         |  75 --------------------------
 .idea/caches/build_file_checksums.ser | Bin 588 -> 588 bytes
 .idea/misc.xml                        |   5 --
 app/build.gradle                      |   4 +-
 colorpicker                           |   2 +-
 5 files changed, 3 insertions(+), 83 deletions(-)
 delete mode 100644 .idea/assetWizardSettings.xml

diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
deleted file mode 100644
index 6c77b51eff..0000000000
--- a/.idea/assetWizardSettings.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="WizardSettings">
-    <option name="children">
-      <map>
-        <entry key="imageWizard">
-          <value>
-            <PersistentState>
-              <option name="children">
-                <map>
-                  <entry key="imageAssetPanel">
-                    <value>
-                      <PersistentState>
-                        <option name="children">
-                          <map>
-                            <entry key="launcher">
-                              <value>
-                                <PersistentState>
-                                  <option name="children">
-                                    <map>
-                                      <entry key="backgroundImage">
-                                        <value>
-                                          <PersistentState>
-                                            <option name="values">
-                                              <map>
-                                                <entry key="scalingPercent" value="0" />
-                                              </map>
-                                            </option>
-                                          </PersistentState>
-                                        </value>
-                                      </entry>
-                                      <entry key="foregroundImage">
-                                        <value>
-                                          <PersistentState>
-                                            <option name="values">
-                                              <map>
-                                                <entry key="scalingPercent" value="75" />
-                                                <entry key="trimmed" value="true" />
-                                              </map>
-                                            </option>
-                                          </PersistentState>
-                                        </value>
-                                      </entry>
-                                    </map>
-                                  </option>
-                                  <option name="values">
-                                    <map>
-                                      <entry key="backgroundAssetType" value="COLOR" />
-                                      <entry key="backgroundColor" value="cccccc" />
-                                      <entry key="foregroundImage" value="$PROJECT_DIR$/images/4.png" />
-                                      <entry key="webIconShape" value="NONE" />
-                                    </map>
-                                  </option>
-                                </PersistentState>
-                              </value>
-                            </entry>
-                          </map>
-                        </option>
-                      </PersistentState>
-                    </value>
-                  </entry>
-                </map>
-              </option>
-            </PersistentState>
-          </value>
-        </entry>
-        <entry key="vectorWizard">
-          <value>
-            <PersistentState />
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 3b7cce37c4c298113e1741535d99876d8f4ef73b..7268f38b1cc82ea11839286192d1eeeff9031bf5 100644
GIT binary patch
delta 54
zcmV-60LlN%1k41Gm;~^!z=^S(0Ra$k*dYBV{{;*%4H0<-1y>!DtpSb^F2Bq%XIcVK
MHhv~Co{Wq%cu@irLI3~&

delta 54
zcmV-60LlN%1k41Gm;~(%L6WhY0Ra%{oq)dS2>S<fXuX?X!>d4(tpSb^rM2@_AmGnf
Mdc?#=Q;M$}c(Vu@{{R30

diff --git a/.idea/misc.xml b/.idea/misc.xml
index caad359b68..99202cc2d6 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="EntryPointsManager">
-    <list size="1">
-      <item index="0" class="java.lang.String" itemvalue="androidx.lifecycle.OnLifecycleEvent" />
-    </list>
-  </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
diff --git a/app/build.gradle b/app/build.gradle
index ad7f661188..359c25f08f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "eu.faircode.email"
         minSdkVersion 23
         targetSdkVersion 28
-        versionCode 60
-        versionName "0.60"
+        versionCode 61
+        versionName "0.61"
         archivesBaseName = "FairEmail-v$versionName"
 
         javaCompileOptions {
diff --git a/colorpicker b/colorpicker
index d6b7e7e8ac..dc64bb476e 160000
--- a/colorpicker
+++ b/colorpicker
@@ -1 +1 @@
-Subproject commit d6b7e7e8acc91045796c1823f87d690ac9cc382e
+Subproject commit dc64bb476e4add2a3a042a3c426c4be0038f38e6