Merge branch 'master' into licensor

This commit is contained in:
Arfon Smith
2016-03-17 19:57:29 -06:00
256 changed files with 55191 additions and 1283 deletions

View File

@@ -1,5 +1,4 @@
source 'https://rubygems.org'
gemspec :name => "github-linguist"
gemspec :name => "github-linguist-grammars"
gem 'byebug' if RUBY_VERSION >= '2.0'
gem 'licensor', :path => "../licensor"