Unfortunately there are merge conflicts against the current 2.0 trunk, see the diff below.
« Back to merge proposal
Unfortunately there are merge conflicts against the current 2.0 trunk, see the diff below.