Merge branch 'master' into blob_in_memory

This commit is contained in:
Paul Chaignon
2015-09-04 00:55:39 +02:00
61 changed files with 2459 additions and 379 deletions

View File

@@ -4,6 +4,7 @@ require "mocha/setup"
require "linguist"
require 'color-proximity'
require "linguist/blob"
require 'licensee'
def fixtures_path
File.expand_path("../fixtures", __FILE__)