Merge branch 'master' into devel

PRUNERS · Feb 8, 2018 · a012450 · a012450
2 parents a741b79 + 4b70e12
commit a012450
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/LICENSE b/LICENSE
@@ -76,4 +76,4 @@ License
      necessarily state or reflect those of the United States
      Government or Lawrence Livermore National Security, LLC, and
      shall not be used for advertising or product endorsement
-     purposes.
+     purposes.