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

Sample files to test the new FileBlob.extension method

2014-06-19 18:34:37 +02:00

Application.php

…

Client.php

…

Controller.php

…

drupal.script!

Change unknown extension of PHP sample file

2014-06-01 19:59:57 +02:00

Form.php

…

Model.php

…

php2.script!

…

php-script.script!

…

php.script!

…

prefix.fcgi

Merge branch 'master' into 1233-local

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