Merge remote-tracking branch 'origin/master'

Browse Source

# Conflicts:
#	.travis.yml

...

This commit is contained in:

Iiro Krankka committed 2017-01-09 13:23:37 +02:00

2 parents f008d5a9a5 53229a38d0

commit e2cae8b55b

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