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
..
JSONCreator	Merge branch 'develop' into feature/molecular	2019-08-15 09:38:57 -04:00
JSONCreator.xcodeproj	Updated the master VC. logic to query molecular server.	2019-08-15 09:36:40 -04:00