Merge branch 'master' into webidl

Browse Source

Conflicts:
	grammars.yml

...

This commit is contained in:

Arfon Smith

2014-12-11 20:52:17 -06:00

parent 37c2bee3ae 1a32a6252b

commit a0d92b80df

22 changed files with 1067 additions and 172 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

312

lib/linguist/languages.yml

File diff suppressed because it is too large Load Diff