mirror of
https://github.com/nasa/openmct.git
synced 2025-06-24 02:04:02 +00:00
Merge branch 'master' into open1233a
This commit is contained in:
@ -1,5 +1,5 @@
|
||||
<!--
|
||||
Open MCT, Copyright (c) 2014-2016, United States Government
|
||||
Open MCT, Copyright (c) 2014-2017, United States Government
|
||||
as represented by the Administrator of the National Aeronautics and Space
|
||||
Administration. All rights reserved.
|
||||
|
||||
|
Reference in New Issue
Block a user