Merge branch 'master' into 'patch-1'

Browse Source

# Conflicts:
#   README.md

...

This commit is contained in:

Dorian Zedler 2018-06-29 20:15:50 +02:00

parent 51fc8dba44 1c4b177219

commit fed5806ed6

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 Expand all files Collapse all files

Diff Content Not Available