Merge pull request #72 from goyney/master

Update the license to Apache 2.0
Templarian · Sep 14, 2020 · edf7457 · edf7457
2 parents 57a8b3a + ba83595
commit edf7457
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 98 deletions.
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,20 @@
+Pictogrammers Free License
+--------------------------
+
+This icon collection is released as free, open source, and GPL friendly by
+the [Pictogrammers](http://pictogrammers.com/) icon group. You may use it
+for commercial projects, open source projects, or anything really.
+
+# Icons: Apache 2.0 (https://www.apache.org/licenses/LICENSE-2.0)
+Some of the icons are redistributed under the Apache 2.0 license. All other
+icons are either redistributed under their respective licenses or are
+distributed under the Apache 2.0 license.
+
+# Fonts: Apache 2.0 (https://www.apache.org/licenses/LICENSE-2.0)
+All web and desktop fonts are distributed under the Apache 2.0 license. Web
+and desktop fonts contain some icons that are redistributed under the Apache
+2.0 license. All other icons are either redistributed under their respective
+licenses or are distributed under the Apache 2.0 license.
+
+# Code: MIT (https://opensource.org/licenses/MIT)
+The MIT license applies to all non-font and non-icon files.
diff --git a/license.md b/license.md
diff --git a/package.json b/package.json
@@ -20,7 +20,7 @@
     "name": "Austin Andrews",
     "web": "http://twitter.com/templarian"
   },
-  "license": "(OFL-1.1 AND MIT)",
+  "license": "Apache-2.0",
   "bugs": {
     "url": "https://github.com/Templarian/MaterialDesign/issues"
   },