Commit Graph

59 Commits

Author SHA1 Message Date
manuroe 353d56ac50 Secure backup setup: Manage the case when the user has already a key backup
but we do not have the private key
2020-06-30 14:15:18 +02:00
ismailgulek b1acd2ad24 Merge branch 'develop' into xcode11
# Conflicts:
#	CHANGES.rst
#	Riot.xcodeproj/project.pbxproj
2020-06-26 17:33:09 +03:00
ismailgulek 6c2c2faea2 Merge branch 'develop' into xcode11
# Conflicts:
#	CHANGES.rst
#	Riot.xcodeproj/project.pbxproj
2020-06-26 17:33:09 +03:00
SBiOSoftWhare a11e740d53 Refactoring secure backup references. 2020-06-26 14:13:37 +02:00
SBiOSoftWhare dfb5627126 Refactoring secure backup references. 2020-06-26 14:13:37 +02:00
SBiOSoftWhare b044488517 Refactoring secure backup references. 2020-06-26 14:01:33 +02:00
SBiOSoftWhare f353d69c14 Refactoring secure backup references. 2020-06-26 14:01:33 +02:00
SBiOSoftWhare 1ef5ea0379 Refactoring secure backup references. 2020-06-26 13:07:53 +02:00
SBiOSoftWhare f3f1654007 Refactoring secure backup references. 2020-06-26 13:07:53 +02:00