Merge branch 'master' into 0.10 (strategy ours)

Browse Source

* master:
  RF: Replace old fashioned "except E , e" with "except E as e" (Closes #1537)

pull/1541/head

Yaroslav Halchenko 2016-09-06 08:19:10 -04:00

parent 87acd7a0fc f6258c7b69

commit aff680eb43

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