Kevin G Christiano ba602c1c86 Merge branch 'develop' into feature/swiftified_textField ... # Conflicts: # MVMCoreUI.xcodeproj/project.pbxproj		2019-10-30 09:35:39 -04:00
..
project.xcworkspace	Migration	2019-01-10 14:23:14 -05:00
project.pbxproj	Merge branch 'develop' into feature/swiftified_textField	2019-10-30 09:35:39 -04:00