Merge branch 'master' into 950

Browse Source

Conflicts:
	lib/linguist/languages.yml

...

This commit is contained in:

Arfon Smith

2014-05-04 19:46:20 -05:00

parent e2b1fe3641 a2f721d4ef

commit 0a54df3a12

193 changed files with 65249 additions and 717 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

919

lib/linguist/languages.yml

File diff suppressed because it is too large Load Diff