Merge remote-tracking branch 'upstream/master'

Browse Source

# Conflicts:
#	README.md

...

This commit is contained in:

Konstantin Gorodinskii committed 2020-04-08 08:37:21 +02:00

2 parents 5185249307 ef4d9ae3e3

commit 2eac4b7c66

3 files changed

+509 -533

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

No files matched your search

after/syntax/css/vim-coloresque.vim

+495 -523

File diff suppressed because it is too large. Load diff