Merge branch 'master' into rework

Browse Source

Conflicts:
	.travis.yml

...

This commit is contained in:

squidfunk

2017-01-08 20:41:56 +01:00

parent 6d01f17193 07f3440f42

commit 0258fe6bcf

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