Merge branch 'master' into 1304-local

Browse Source

Conflicts:
	grammars.yml

...

This commit is contained in:

Arfon Smith

2014-12-30 22:15:55 -06:00

parent 6950b028df 3c60fba430

commit 6f21df7624

292 changed files with 5243 additions and 1418 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

375

lib/linguist/languages.yml

File diff suppressed because it is too large Load Diff