From d923f69674dc63735961ffb766f89f1e05142c7d Mon Sep 17 00:00:00 2001
From: Jon Rohan <rohan@github.com>
Date: Mon, 6 Jun 2016 19:44:08 -0400
Subject: [PATCH 1/3] Revert license to SPDX format

---
 package.json | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 08cf10c0e..011958424 100644
--- a/package.json
+++ b/package.json
@@ -4,10 +4,7 @@
   "description": "A scalable set of icons handcrafted with <3 by GitHub.",
   "homepage": "https://octicons.github.com",
   "author": "GitHub Inc.",
-  "license": [
-    "OFL-1.1",
-    "MIT"
-  ],
+  "license": "(OFL-1.1 AND MIT)",
   "style": "index.scss",
   "files": [
     "index.scss",

From 144ddc95e0aa7ab1353bb350d6a9b42c9b9a17ea Mon Sep 17 00:00:00 2001
From: Jon Rohan <rohan@github.com>
Date: Mon, 6 Jun 2016 19:45:43 -0400
Subject: [PATCH 2/3] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c011fe51a..b03ff5c31 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ Adds:
 
 - Installation docs https://github.com/primer/octicons/pull/94
 
+Fixes:
+
+- Revert license back to SPDX standard
+
 ### 4.0.0 (June 6, 2016)
 
 Adds:

From cd87c5fc4185df6434a61ba055cd0568cc1e604c Mon Sep 17 00:00:00 2001
From: Jon Rohan <rohan@github.com>
Date: Tue, 7 Jun 2016 07:44:05 -0400
Subject: [PATCH 3/3] Update package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 011958424..65ecedb2a 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "description": "A scalable set of icons handcrafted with <3 by GitHub.",
   "homepage": "https://octicons.github.com",
   "author": "GitHub Inc.",
-  "license": "(OFL-1.1 AND MIT)",
+  "license": "(OFL-1.1 OR MIT)",
   "style": "index.scss",
   "files": [
     "index.scss",