Merge remote-tracking branch 'upstream/master'

2025-02-25 18:55:37 -06:00 · 2013-10-30 10:59:33 -07:00 · 2013-10-30 10:59:33 -07:00 · 8a4b8cf1b0
commit 8a4b8cf1b0
parent 113c6fc572 67a1398608
1 changed files with 2 additions and 1 deletions
--- 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,
 });