Commit Graph

4 Commits (b9beb7aec43ab945b57324ca263c63d28ded1462)

Author SHA1 Message Date
Morgan Pretty bef27ee0c7 Fixed build issues resulting from rebase after Onboarding 8 months ago
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
9 months ago
Morgan Pretty 59bc1f4ec9 Added another missed change 9 months ago
Morgan Pretty 1726930e2e Merge remote-tracking branch 'upstream/dev' into onboarding 10 months ago