Lekshmi S ce9d2be44f Merge branch 'develop' into feature/Headers_H2_NoButtons_BodyText ... # Conflicts: # MVMCoreUI.xcodeproj/project.pbxproj # MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift		2020-03-17 15:38:15 +05:30
..
Atoms	bug fixes	2020-03-16 19:47:29 -04:00
BaseClasses	shifting and improving	2020-03-06 17:06:20 -05:00
BaseControllers	sticky footer	2020-03-16 12:03:31 -04:00
Categories	fix molecule protocol type	2020-03-16 11:58:36 -04:00
Containers	Merge branch 'develop' into feature/isaac_screen	2020-03-06 17:07:21 -05:00
CustomPrimitives	color	2020-02-28 11:36:14 -05:00
FormUIHelpers	latest state of validator	2020-03-13 15:32:29 -04:00
Legacy	fix molecule protocol type	2020-03-16 11:58:36 -04:00
Models	merge conflicts	2020-03-06 18:04:30 -05:00
Molecules	Merge branch 'develop' into feature/Headers_H2_NoButtons_BodyText	2020-03-17 15:38:15 +05:30
Organisms	fix molecule protocol type	2020-03-16 11:58:36 -04:00
OtherHandlers	Merge branch 'develop' into feature/Headers_H2_NoButtons_BodyText	2020-03-17 15:38:15 +05:30
Styles	fix semi colon paste in m file	2020-02-26 13:28:23 -05:00
SupportingFiles	add 2.0 font back for march release	2020-03-05 09:58:32 -05:00
Templates	fixes for certain devices	2020-03-16 14:32:04 -04:00
TopAlert	Top Alert Fixes for top color and status bar color	2020-02-26 11:49:31 -05:00
Utility	add 2.0 font back for march release	2020-03-05 09:58:32 -05:00
Info.plist	basic template	2019-01-08 10:21:16 -05:00
MVMCoreUI.h	update font	2020-02-26 11:06:34 -05:00