Commit Graph

3 Commits (d95744ce2eb66155455f1e7a812c234abab1d7b6)

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 1 year ago
Morgan Pretty 1726930e2e Merge remote-tracking branch 'upstream/dev' into onboarding 1 year ago