Merge remote-tracking branch 'upstream/master'

Browse Source

# Conflicts:
#	README.md

pull/154/head^2

Philipp Dormann 3 years ago

parent 9bfddd9fde 137f5da3da

commit d7baeb7e14

No known key found for this signature in database

GPG Key ID: 3BB9ADD52DCA4314

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File

Diff Content Not Available