Merge branch 'QA_4_2' into MAINT_4_3_0

Browse Source

Conflicts:
	.travis.yml

...

This commit is contained in:

Michal Čihař 2014-12-04 10:48:25 +01:00

parent 7e4baefbf0 0bf779c61c

commit 7ecdaa2fd2

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available