Merge branch 'maintenance-2.0'

Browse source

Merge using 'ours' strategy.

...

This commit is contained in:

William S Fulton 2014-02-16 22:19:18 +00:00

parent 81cc95155e 1c4213594a

commit 0d63e5d07b

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 is not available