enzevalos_iphone/DataHandler.swift · 1aea56ff815bf3995b82791db9d17f9806bdf605 · enzevalos / enzevalos_iphone

5 years ago

Oliver Wiese authored 5 years ago

Conflicts:
	enzevalos_iphone.xcodeproj/project.pbxproj
	enzevalos_iphone.xcodeproj/xcshareddata/xcschemes/enzevalos_iphone.xcscheme
	enzevalos_iphone/Base.lproj/Main.storyboard
	enzevalos_iphone/ContactViewController.swift
	enzevalos_iphone/SwiftUI/Inbox/Inbox.swift
	enzevalos_iphoneTests/GeneratedMocks.swift

0272cb6c

History

Merge branch 'dev'

Oliver Wiese authored 5 years ago

Conflicts:
	enzevalos_iphone.xcodeproj/project.pbxproj
	enzevalos_iphone.xcodeproj/xcshareddata/xcschemes/enzevalos_iphone.xcscheme
	enzevalos_iphone/Base.lproj/Main.storyboard
	enzevalos_iphone/ContactViewController.swift
	enzevalos_iphone/SwiftUI/Inbox/Inbox.swift
	enzevalos_iphoneTests/GeneratedMocks.swift

Code owners

Assign users and groups as approvers for specific file changes. Learn more.