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

1

vendor/grammars/language-fontforge vendored Submodule

Submodule vendor/grammars/language-fontforge added at b8233304fd

1

vendor/grammars/language-haml vendored Submodule

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

1

vendor/grammars/language-ninja vendored Submodule

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