Christiano, Kevin b00d439ead Merge branch 'develop' into feature/kevin ... # Conflicts: # MVMCoreUI/Atoms/Views/Label.swift # MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m		2019-05-29 10:51:11 -04:00
..
Atoms	Merge branch 'develop' into feature/kevin	2019-05-29 10:51:11 -04:00
BaseControllers	molecule list	2019-05-23 18:32:11 -04:00
Categories	thickness. molecule alignment	2019-04-29 13:36:36 -04:00
Containers	Merge branch 'develop' into bugfix/detail_view_controller	2019-05-08 12:45:42 -04:00
FormUIHelpers	improvements	2019-05-03 16:47:45 -04:00
LegacyControllers	Merge branch 'develop' into feature/kevin	2019-04-18 09:32:31 -04:00
Molecules	Merge branch 'develop' into feature/kevin	2019-05-29 10:51:11 -04:00
OtherHandlers	Merge branch 'develop' into feature/kevin	2019-05-29 10:51:11 -04:00
Styles	add space in method name	2019-05-13 16:07:17 -04:00
SupportingFiles	update acc for mfstyler	2019-05-02 14:34:39 -04:00
Templates	fix extra space	2019-05-28 16:26:23 -04:00
TopAlert	change order of code	2019-04-17 15:20:56 -04:00
Utility	molecule list	2019-05-23 18:32:11 -04:00
Info.plist	basic template	2019-01-08 10:21:16 -05:00
MVMCoreUI.h	molecule list	2019-05-23 18:32:11 -04:00