Resolve conflicts from upstream changes

Browse Source

...

This commit is contained in:

Alhadis

2016-10-06 17:00:28 +11:00

parent 48b64c2d31 c863435c84

commit 6ac1ac9232

123 changed files with 4724 additions and 2615 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

3400

lib/linguist/languages.yml

File diff suppressed because it is too large Load Diff