KevinMidboe/linguist
1
0
Fork 0
mirror of https://github.com/KevinMidboe/linguist.git synced 2026-01-26 03:06:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'github/master' into chapel-lang

Browse Source 
Conflicts:
	lib/linguist/samples.json
This commit is contained in:
Thomas Van Doren
2014-07-05 11:52:58 -07:00
parent c5acce0604 94b4ad1de6
commit bb7d6ab429
9 changed files with 116 additions and 10858 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/linguist/languages.yml
View File

@@ -157,7 +157,6 @@ Assembly:
- nasm
extensions:
- .asm
- .inc
Augeas:
type: programming
@@ -1915,6 +1914,7 @@ Ruby:
- Jarfile
- Mavenfile
- Podfile
- Puppetfile
- Thorfile
- Vagrantfile
- buildfile