Merge branch 'master' of https://github.com/ets-berkeley-edu/collabos…

…phere
ets-berkeley-edu · Sep 9, 2015 · 8525125 · 8525125
2 parents d45aa3a + e3a41b1
commit 8525125
Show file tree

Hide file tree

Showing 2 changed files with 156 additions and 59 deletions.
diff --git a/node_modules/col-canvas/lib/poller.js b/node_modules/col-canvas/lib/poller.js
diff --git a/node_modules/col-canvas/tests/test-poller.js b/node_modules/col-canvas/tests/test-poller.js