Auto-merge bulk update of org policies

* Bulk update of repo policies * Bulk update of repo policies * Bulk update of repo policies * Bulk update of repo policies * Bulk update of repo policies * Bulk update of repo policies * Bulk update of repo policies * Bulk update of repo policies * Bulk update of repo policies * Bulk update of repo policies * Bulk update of repo policies * Bulk update of repo policies * Bulk update of repo policies * Bulk update of repo policies * Bulk update of repo policies * Bulk update of repo policies * Bulk update of repo policies
e-mission · Jan 14, 2021 · ab2f993 · ab2f993
1 parent 42a982c
commit ab2f993
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2014-2020, UC Regents
+Copyright (c) 2020-2021, Alliance for Sustainable Energy
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/ThirdPartyContributors.md b/ThirdPartyContributors.md
@@ -0,0 +1,16 @@
+Copyright (c) 2014-2020, UC Regents
+
+From its inception to mid-2020, this project was supported by Prof. David
+Culler and Prof. Randy Katz at UC Berkeley through various grants.
+
+In addition to NSF CISE Expeditions Award CCF-1730628, this research was
+supported in part by gifts from Alibaba, Amazon Web Services, Ant Financial,
+Arm, CapitalOne, Ericsson, Facebook, Google, Huawei, Intel, Microsoft,
+Scotiabank, Splunk and VMware. This work was also supported in part by the
+CONIX Research Center, one of six centers in JUMP, a Semiconductor Research
+Corporation (SRC) program sponsored by DARPA.
+
+Contributions owned by their respective contributors.
+
+This project would not be possible without contributors (code, documentation,
+issues, ideas) from across the world. Thank you!