Merge remote-tracking branch 'upstream/master'

2013-10-30 10:59:33 -07:00
parent 113c6fc572 67a1398608
commit 8a4b8cf1b0
1 changed files with 2 additions and 1 deletions
@@ -86,5 +86,6 @@ require.config({
    datepicker:             ['jquery', 'bootstrap'],

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