Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Rashid Khan 2013-10-30 10:59:33 -07:00
commit 8a4b8cf1b0

View File

@ -86,5 +86,6 @@ require.config({
datepicker: ['jquery', 'bootstrap'],
elasticjs: ['angular', '../vendor/elasticjs/elastic']
}
},
waitSeconds: 60,
});