Christiano, Kevin b88052ed9b Merge branch 'develop' into feature/label_conversion ... # Conflicts: # MVMCoreUI.xcodeproj/project.pbxproj		2019-04-10 16:19:07 -04:00
..
Buttons	Changes for new feed template	2019-04-09 10:38:26 -04:00
TextFields	small formatting fixes	2019-04-04 09:47:45 -04:00
Views	Merge branch 'develop' into feature/label_conversion	2019-04-10 16:19:07 -04:00