mirror of
https://github.com/nasa/openmct.git
synced 2025-03-12 07:24:13 +00:00
Merge branch 'master' into csv-export-update-751
This commit is contained in:
commit
536e2290b8
@ -146,7 +146,7 @@ define([
|
|||||||
"$timeout",
|
"$timeout",
|
||||||
"objectService"
|
"objectService"
|
||||||
]
|
]
|
||||||
},
|
}
|
||||||
],
|
],
|
||||||
"directives": [
|
"directives": [
|
||||||
{
|
{
|
||||||
@ -309,7 +309,7 @@ define([
|
|||||||
"uses": [
|
"uses": [
|
||||||
"action"
|
"action"
|
||||||
]
|
]
|
||||||
},
|
}
|
||||||
],
|
],
|
||||||
"components": [
|
"components": [
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user