mirror of
https://github.com/moparisthebest/mail
synced 2025-01-30 22:50:17 -05:00
Merge branch 'master' into gmail
This commit is contained in:
commit
8cb142861c
@ -8,7 +8,9 @@
|
||||
<link rel="stylesheet" href="css/styles.css"/>
|
||||
|
||||
<!-- The Scripts -->
|
||||
<script data-main="sandbox.js" src="lib/require.js"></script>
|
||||
<script src="lib/require.js"></script>
|
||||
<script src="require-config.js"></script>
|
||||
<script src="sandbox.js"></script>
|
||||
</head>
|
||||
|
||||
<body></body>
|
||||
|
@ -1,10 +1,7 @@
|
||||
require(['require-config'], function() {
|
||||
'use strict';
|
||||
|
||||
// Start the main app logic.
|
||||
require(['jquery', 'backbone', 'js/app-router',
|
||||
'js/app-config'
|
||||
], function($, Backbone, Router, app) {
|
||||
'use strict';
|
||||
|
||||
var router,
|
||||
mainWindow,
|
||||
@ -51,4 +48,3 @@ require(['require-config'], function() {
|
||||
};
|
||||
|
||||
});
|
||||
});
|
Loading…
Reference in New Issue
Block a user