Skip to content
Snippets Groups Projects
Commit 86870525 authored by cruxfilm's avatar cruxfilm
Browse files

Merge branch 'dev'

Conflicts:
	enzevalos_iphone.xcodeproj/project.pbxproj
	enzevalos_iphone/New Group/Mailbot.swift
	enzevalos_iphone/SwiftUI/DisplayProtocols.swift
	enzevalos_iphone/SwiftUI/Inbox/MailListView.swift
	enzevalos_iphone/SwiftUI/Read/Tabbed Views/SenderViewChildren/SmallContactListView.swift
	enzevalos_iphone/SwiftUI/Read/Tabbed Views/SenderViewMain.swift
	enzevalos_iphone/mail/IncomingMail.swift
	enzevalos_iphone/persistentData/AddressRecord.swift
	enzevalos_iphone/persistentData/PersistentDataProvider.swift
parents 1407d0d3 f01b6a42
Branches
No related tags found
1 merge request!74Integration of new ComposeView
Showing
with 709 additions and 494 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment