ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-20 16:10:23 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into api-1124b

Browse Source 
Conflicts:
	bower.json
This commit is contained in:
Victor Woeltjen
2016-09-30 17:11:05 -07:00
parent f8819ee946 5b0fa90e39
commit 219c9348d9
9 changed files with 4 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
openmct.js
View File

@ -30,7 +30,6 @@ requirejs.config({
"EventEmitter": "bower_components/eventemitter3/index",
"es6-promise": "bower_components/es6-promise/es6-promise.min",
"html2canvas": "bower_components/html2canvas/build/html2canvas.min",
"jsPDF": "bower_components/jspdf/dist/jspdf.debug",
"moment": "bower_components/moment/moment",
"moment-duration-format": "bower_components/moment-duration-format/lib/moment-duration-format",
"saveAs": "bower_components/FileSaver.js/FileSaver.min",
@ -53,9 +52,6 @@ requirejs.config({
"html2canvas": {
"exports": "html2canvas"
},
"jsPDF": {
"exports": "jsPDF"
},
"moment-duration-format": {
"deps": ["moment"]
},