electrum

commit 4018bd12bd6d864fa1e101624f6d5ee898b0c76a
parent 0b72803dd479e8e3e3de367f9bf484223b1b87b1
Author: ThomasV <thomasv@electrum.org>
Date:   Tue, 19 Jun 2018 11:59:52 +0200

Merge pull request #4446 from SomberNight/android_disable_backups

android: disable backups
Diffstat:
M
gui/kivy/Readme.md
 | 
4
+++-

1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/gui/kivy/Readme.md b/gui/kivy/Readme.md
@@ -33,9 +33,11 @@ cd /opt
 git clone https://github.com/kivy/python-for-android
 cd python-for-android
 git remote add agilewalker https://github.com/agilewalker/python-for-android
+git remote add sombernight https://github.com/SomberNight/python-for-android
 git fetch --all
 git checkout 93759f36ba45c7bbe0456a4b3e6788622924cbac
-git merge a2fb5ecbc09c4847adbcfd03c6b1ca62b3d09b8d
+git cherry-pick a2fb5ecbc09c4847adbcfd03c6b1ca62b3d09b8d  # openssl-fix
+git cherry-pick a0ef2007bc60ed642fbd8b61937995dbed0ddd24  # disable backups
 ```
 
 ## 4. Install buildozer