Merge branch 'master' into 0.10

Browse Source

empty merge, resolving conflicts after amend with cyclic recursions

pull/1461/head

sebres 2016-05-26 11:23:53 +02:00

parent 93f776d2ee 858c5c0d00

commit 16d646bbb6

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