Closed zorkow closed 2 years ago
My client was screwed up. I am merging directly now.
This also needs to be merged into the 3.2-latest branch (usually I merge into the x.y-latest and then merge that into master).
This also needs to be merged into the 3.2-latest branch (usually I merge into the x.y-latest and then merge that into master).
I've done that now. Sorry about the confusion. But it goes some way to explain why the logs in my client looked odd.
I thought about merging directly, but I am not sure if
master
is the right branch. At least on my local client there seem to be some commit discrepancies.