Merge remote-tracking branch 'refs/remotes/github/master'

Browse Source

Conflicts:
	.gitmodules
	grammars.yml

...

This commit is contained in:

Ahmad Salim Al-Sibahi

2016-12-07 08:36:48 +01:00

parent c17cdca896 33ce2d7264

commit be262d0b4f

30 changed files with 413 additions and 86 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

vendor/grammars/language-fontforge

Vendored Submodule

+1

Submodule vendor/grammars/language-fontforge added at b8233304fd

vendor/grammars/language-haml

Vendored Submodule

+1

Submodule vendor/grammars/language-haml added at 301625dff4

vendor/grammars/language-ninja

Vendored Submodule

+1

Submodule vendor/grammars/language-ninja added at 207a60371f