Oswaldo Acauan 1c5c74db67 Fix merge conflicts		2017-06-05 13:52:46 +00:00
..
cursor	Fix merge conflicts	2017-06-05 13:52:46 +00:00
default-content	Fix merge conflicts	2017-06-05 13:52:46 +00:00
presentation-toolbar	Fix merge conflicts	2017-06-05 13:52:46 +00:00
slide	Fix merge conflicts	2017-06-05 13:52:46 +00:00
component.jsx	Fix merge conflicts	2017-06-05 13:52:46 +00:00
container.jsx	Switched to prop-types package to remove new React 15 warnings	2017-06-03 19:40:14 -07:00
service.js	Linter auto fix	2017-06-02 19:25:02 +00:00
styles.scss	Restructured the whiteboard code	2017-02-23 10:19:59 -08:00