Kevin G Christiano d15d8b2636 Merge branch 'develop' into feature/swiftified_textField ... # Conflicts: # MVMCoreUI.xcodeproj/project.pbxproj		2019-10-24 11:20:26 -04:00
MVMCoreUI	Merge branch 'develop' into feature/swiftified_textField	2019-10-24 11:20:26 -04:00
MVMCoreUI.xcodeproj	Merge branch 'develop' into feature/swiftified_textField	2019-10-24 11:20:26 -04:00
.gitignore	basic template	2019-01-08 10:21:16 -05:00