Merge remote-tracking branch 'upstream/master'

Browse Source

# Conflicts:
#	after/syntax/css/vim-coloresque.vim

...

This commit is contained in:

Konstantin Gorodinskii

2020-04-08 08:30:38 +02:00

parent b06d67a073 5dbaf61f8c

commit 7de525ec06

3 changed files with 508 additions and 532 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

1010

after/syntax/css/vim-coloresque.vim

File diff suppressed because it is too large Load Diff