Arfon Smith 9e50e188a8 Merge branch 'master' into 1233-local ...

Conflicts:
	lib/linguist/language.rb
	lib/linguist/languages.yml
	lib/linguist/samples.json

2014-11-01 10:04:22 -05:00

..

filenames

Move .pryrc to filenames

2014-06-20 11:27:28 -07:00

foo.rb

Rename samples subdirectories

2012-07-23 15:52:49 -05:00

formula.rb

Rename samples subdirectories

2012-07-23 15:52:49 -05:00

grit.rb

Rename samples subdirectories

2012-07-23 15:52:49 -05:00

inflector.rb

Rename samples subdirectories

2012-07-23 15:52:49 -05:00

jekyll.rb

Rename samples subdirectories

2012-07-23 15:52:49 -05:00

jenkinsci.pluginspec

Add .pluginspec sample

2013-03-10 15:25:02 -07:00

macruby.script!

Move shebang detection into classifier

2012-08-03 15:07:36 -05:00

mdata_server.fcgi

Merge branch 'master' into 1233-local

2014-11-01 10:04:22 -05:00

rabl.rabl

Fix ruby dir

2012-07-23 16:22:28 -05:00

resque.rb

Rename samples subdirectories

2012-07-23 15:52:49 -05:00

ruby2.script!

more and better samples for Nu, Racket, Scala

2013-06-06 16:53:16 -05:00

ruby.script!

Move shebang detection into classifier

2012-08-03 15:07:36 -05:00

script.rake

Rename samples subdirectories

2012-07-23 15:52:49 -05:00

sinatra.rb

Rename samples subdirectories

2012-07-23 15:52:49 -05:00

wrong_shebang.rb

Rename samples subdirectories

2012-07-23 15:52:49 -05:00