Klaus 3af281d648 Merge remote-tracking branch 'upstream/master' into merge-master-mconf		2017-07-17 13:33:45 -03: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	Merge remote-tracking branch 'upstream/master' into merge-master-mconf	2017-07-17 13:33:45 -03:00
slide	Fix merge conflicts	2017-06-05 13:52:46 +00:00
component.jsx	handle slides messages	2017-06-30 15:16:00 -04:00
container.jsx	Switched to prop-types package to remove new React 15 warnings	2017-06-03 19:40:14 -07:00
service.js	handle slides messages	2017-06-30 15:16:00 -04:00
styles.scss	Restructured the whiteboard code	2017-02-23 10:19:59 -08:00