Merge branch 'master' into spdx-file

licensee · Nov 27, 2017 · 7739864 · 7739864
2 parents 389c22e + 0f6199a
commit 7739864
Show file tree

Hide file tree

Showing 9 changed files with 371 additions and 169 deletions.
diff --git a/script/diff b/script/diff
@@ -3,6 +3,7 @@
 # Example usage: cat LICENSE.md | be script/diff mit
 
 require 'licensee'
+require 'tmpdir'
 
 if STDIN.tty? || ARGV[0].to_s.empty?
   puts 'USAGE: [LICENSE_CONTENT] | script/diff [LICENSE_ID]'

diff --git a/vendor/choosealicense.com/_licenses/afl-3.0.txt b/vendor/choosealicense.com/_licenses/afl-3.0.txt
diff --git a/vendor/choosealicense.com/_licenses/apache-2.0.txt b/vendor/choosealicense.com/_licenses/apache-2.0.txt
diff --git a/vendor/choosealicense.com/_licenses/bsd-3-clause-clear.txt b/vendor/choosealicense.com/_licenses/bsd-3-clause-clear.txt
diff --git a/vendor/choosealicense.com/_licenses/epl-1.0.txt b/vendor/choosealicense.com/_licenses/epl-1.0.txt
diff --git a/vendor/choosealicense.com/_licenses/ms-pl.txt b/vendor/choosealicense.com/_licenses/ms-pl.txt