perroned 59bcb84b9d Merge remote-tracking branch 'anton/meteor-rebuild-server' into creating-better-templates ... Conflicts: labs/meteor-client/client/globals.coffee labs/meteor-client/client/main.coffee labs/meteor-client/client/views/whiteboard/whiteboard.html labs/meteor-client/client/whiteboard_models/whiteboard_paper.coffee		2014-08-13 13:56:04 -07:00
..
slide.coffee	cleaning up	2014-08-12 17:44:32 +00:00
slide.html	cleaning up	2014-08-12 17:44:32 +00:00
whiteboard.html	Merge remote-tracking branch 'anton/meteor-rebuild-server' into creating-better-templates	2014-08-13 13:56:04 -07:00