Merge branch 'master' into version/2.0

Browse Source

Conflicts:
	README.md

...

This commit is contained in:

Samy Pessé

2015-03-09 10:42:42 +01:00

parent d72c397f23 e1594cde2c

commit 1bf68a5aa0

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