Merge branch 'master' into open1233a

2017-04-26 12:24:47 -07:00
parent 977aea45b3 fd3312734c
commit 5f8a35ecc0
978 changed files with 3890 additions and 2053 deletions
--- a/platform/commonUI/general/res/sass/items/_item.scss
+++ b/platform/commonUI/general/res/sass/items/_item.scss
@@ -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.
 *
@@ -133,4 +133,4 @@
        }
    }

-}
+}