The deprecated files are still gone, and I get 2 conflicts when merging this branch into trunk.
« Back to merge proposal
The deprecated files are still gone, and I get 2 conflicts when merging this branch into trunk.