Merge branch 'master'

Browse Source

Conflicts:
	README.md

...

This commit is contained in:

Danielv123 committed 2016-10-09 11:37:24 +02:00

2 parents 8f426a1362 dfa8b573df

commit 511e31f24f

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

Diff Content Not Available