alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'open-master' into open806

Browse Source 
Merge in latest in preparation for review of changes
for WTD-806
This commit is contained in:
Victor Woeltjen
2015-04-20 19:35:19 -07:00
parent 186ae05686 daabe4312d
commit 4a4ef8c0f6
16 changed files with 842 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
platform/telemetry/bundle.json
View File

@@ -1,6 +1,6 @@
{
"name": "Data bundle",
"description": "Interfaces and infrastructure for real-time and historical data.",
"description": "Interfaces and infrastructure for real-time and historical data",
"configuration": {
"paths": {
"moment": "moment.min"
@@ -55,9 +55,10 @@
"name": "Moment.js",
"version": "2.7.0",
"author": "Tim Wood, Iskren Chernev, Moment.js contributors",
"description": "Time/date parsing/formatting.",
"description": "Time/date parsing/formatting",
"website": "http://momentjs.com",
"license": "MIT",
"copyright": "Copyright (c) 2011-2014 Tim Wood, Iskren Chernev, Moment.js contributors",
"license": "license-mit",
"link": "https://raw.githubusercontent.com/moment/moment/develop/LICENSE"
}
]