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

Merge remote-tracking branch 'origin/api-tutorials' into api-view

Browse Source 
Conflicts:
	src/MCT.js
	src/api/api.js
This commit is contained in:
Victor Woeltjen
2016-07-01 10:08:05 -07:00
parent 96316de6e4 d51e6bfd92
commit b2e7db71cc
11 changed files with 438 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
main.js
View File

@ -35,7 +35,8 @@ requirejs.config({
"screenfull": "bower_components/screenfull/dist/screenfull.min",
"text": "bower_components/text/text",
"uuid": "bower_components/node-uuid/uuid",
"zepto": "bower_components/zepto/zepto.min"
"zepto": "bower_components/zepto/zepto.min",
"lodash": "bower_components/lodash/lodash"
},
"shim": {
"angular": {