Merge branch 'master' into 1100-local

Browse Source

Conflicts:
	lib/linguist/languages.yml

...

This commit is contained in:

Arfon Smith

2014-06-23 10:28:41 +01:00

parent 9d569c8bd5 27a4eeb206

commit 89999e60bf

185 changed files with 41417 additions and 888 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

931

lib/linguist/languages.yml

File diff suppressed because it is too large Load Diff