From bcd3042491b5465f782abe0945cfd48b752e1f0e Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevin.serrano@consensys.net>
Date: Tue, 13 Feb 2018 14:17:13 -0800
Subject: Standardize license.

---
 LICENSE | 40 +++++++++++++---------------------------
 1 file changed, 13 insertions(+), 27 deletions(-)

(limited to 'LICENSE')

diff --git a/LICENSE b/LICENSE
index 429f4eaee..96e55582b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,34 +1,20 @@
-Copyright (c) 2016 MetaMask
-
-The Ethereum Project Contributor Asset Distribution Terms ( MIT + Share-alike )
-
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+MIT License
 
-associated documentation files (the "Software"), to deal in the Software without restriction,
-
-including without limitation the rights to use, copy, modify, merge, publish, distribute,
-
-sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+Copyright (c) 2016 MetaMask
 
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all copies or substantial
-
-portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-
-THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-These licence terms have been adapted from the MIT licence.
\ No newline at end of file
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-- 
cgit v1.2.3


From 3eba74a0f50d2635c6c80d9e5ce61663b9108eb7 Mon Sep 17 00:00:00 2001
From: Thomas <tmashuang@gmail.com>
Date: Mon, 26 Feb 2018 16:23:24 -0800
Subject: Update LICENSE to current year.

---
 LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'LICENSE')

diff --git a/LICENSE b/LICENSE
index 96e55582b..ddfbecf90 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016 MetaMask
+Copyright (c) 2018 MetaMask
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
-- 
cgit v1.2.3