Merge branch 'master' of https://github.com/github/linguist into meganemura-replace-haml

Browse Source

...

This commit is contained in:

Brandon Black

2016-12-06 22:13:40 -08:00

parent 31aafa2c78 c486f56204

commit 33ce2d7264

15 changed files with 108 additions and 26 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1

vendor/grammars/language-fontforge vendored Submodule

Submodule vendor/grammars/language-fontforge added at b8233304fd

1

vendor/grammars/language-ninja vendored Submodule

Submodule vendor/grammars/language-ninja added at 207a60371f

1

vendor/grammars/ninja.tmbundle vendored

Submodule vendor/grammars/ninja.tmbundle deleted from 89d9cf3330