Commit Graph

3 Commits (65f70ff1e3257d0a53a183ca91156f4a3cf62361)

Author SHA1 Message Date
Morgan Pretty ed472f44c5 Merge remote-tracking branch 'upstream/dev' into release/2.6.3
# Conflicts:
#	Session/Meta/AppDelegate.swift
#	Session/Onboarding/LandingVC.swift
#	Session/Onboarding/LinkDeviceVC.swift
#	Session/Onboarding/RegisterVC.swift
#	Session/Onboarding/RestoreVC.swift
1 year ago
Morgan Pretty 59bc1f4ec9 Added another missed change 2 years ago
Morgan Pretty 1726930e2e Merge remote-tracking branch 'upstream/dev' into onboarding 2 years ago