get ready to merge next onto master.

Browse Source

we want to prefer anything on next.
Merge branch 'master' into next

...

This commit is contained in:

Dave

2014-09-17 18:32:26 -04:00

parent a0723fdbf5 02f189fc86

commit 9ad9d31f69

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