Merge remote-tracking branch 'upstream/master'

8a4b8cf1 · Rashid Khan · 113c6fc5 · 67a13986 · 8a4b8cf1
Commit 8a4b8cf1 authored Oct 30, 2013 by Rashid Khan
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletions

src/app/components/require.config.js
+2 -1

No files found.
--- a/src/app/components/require.config.js
+++ b/src/app/components/require.config.js
@@ -86,5 +86,6 @@ require.config({
    datepicker:             ['jquery', 'bootstrap'],

    elasticjs:              ['angular', '../vendor/elasticjs/elastic']
-  }
+  },
+  waitSeconds: 60,
 });