Oswaldo Acauan 1c5c74db67 Fix merge conflicts		2017-06-05 13:52:46 +00:00
..
message-form	Fix merge conflicts	2017-06-05 13:52:46 +00:00
message-list	Fix merge conflicts	2017-06-05 13:52:46 +00:00
notification	Switched to prop-types package to remove new React 15 warnings	2017-06-03 19:40:14 -07:00
component.jsx	Fix merge conflicts	2017-06-05 13:52:46 +00:00
container.jsx	Fix merge conflicts	2017-06-05 13:52:46 +00:00
service.js	Fix merge conflicts	2017-06-05 13:52:46 +00:00
styles.scss	HTML5 - changed variable name	2017-03-16 15:39:34 -07:00