Merge branch 'master' into jmorgan_bump_0.4.1

2014-12-09 11:03:12 -08:00 · 2014-12-09 11:03:12 -08:00 · 776f8d1218
parent ce34b35485 357417b026
commit 776f8d1218
1 changed files with 1 additions and 0 deletions
--- a/meteor/client/main.js
+++ b/meteor/client/main.js
@ -2,6 +2,7 @@ var remote = require('remote');
 var Menu = remote.require('menu');
 var MenuItem = remote.require('menu-item');
 var BrowserWindow = remote.require('browser-window');
+var app = remote.require('app');

 // main.js
 var template = [