Kevin G Christiano e1c4fdda63 Merge branch 'develop' into feature/molecular ... # Conflicts: # JSONCreator_iOS/JSONCreator/AppDelegate.swift # JSONCreator_iOS/JSONCreator/DetailViewController.swift # JSONCreator_iOS/JSONCreator/MasterViewController.swift		2019-08-15 09:38:57 -04:00
..
Assets.xcassets	first commit	2019-08-06 15:55:50 -04:00
Base.lproj	Updated the master VC. logic to query molecular server.	2019-08-15 09:36:40 -04:00
JSON	first commit	2019-08-06 15:55:50 -04:00
AppDelegate.swift	Updated the master VC. logic to query molecular server.	2019-08-15 09:36:40 -04:00
DetailViewController.swift	Merge branch 'develop' into feature/molecular	2019-08-15 09:38:57 -04:00
Info.plist	Make it more user friendly	2019-08-13 15:38:59 -04:00
MasterViewController.swift	Merge branch 'develop' into feature/molecular	2019-08-15 09:38:57 -04:00