Merge branch '4.9' into 4.10

Browse Source

This merge uses `ours` strategy for forward merging.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

...

This commit is contained in:

Rohit Yadav 2017-08-01 20:41:00 +02:00

parent 98a9856b70 b70879cbac

commit d53f500977

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