Commit 8a4b8cf1 by Rashid Khan

Merge remote-tracking branch 'upstream/master'

parents 113c6fc5 67a13986
......@@ -86,5 +86,6 @@ require.config({
datepicker: ['jquery', 'bootstrap'],
elasticjs: ['angular', '../vendor/elasticjs/elastic']
}
},
waitSeconds: 60,
});
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment