Merge branch 'master' into develop

Browse Source

# Conflicts:
#	.travis.yml

...

This commit is contained in:

michael starke

2017-06-08 19:55:25 +02:00

parent 20cd994ac8 5524d1eb5c

commit 294c367306

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