Merge remote-tracking branch 'origin/open812' into open-master

This commit is contained in:
bwyu 2015-02-09 14:29:29 -08:00
commit 2bbe845f18

View File

@ -3,7 +3,7 @@
"description": "Interfaces and infrastructure for real-time and historical data.", "description": "Interfaces and infrastructure for real-time and historical data.",
"configuration": { "configuration": {
"paths": { "paths": {
"moment": "moment.min.js" "moment": "moment.min"
}, },
"shim": { "shim": {
"moment": { "moment": {