Merge branch 'master' of github.com:nasa/openmct into open967

This commit is contained in:
David Hudson 2016-09-12 15:46:04 +09:00
commit 0f1d685ae6

View File

@ -387,7 +387,7 @@ define([
"constants": [
{
"key": "editModeBlacklist",
"value": ["copy", "follow", "window", "link", "locate"]
"value": ["copy", "follow", "link", "locate"]
},
{
"key": "nonEditContextBlacklist",