Yesterday, the GH tool merged the 3.0 branch into the 2.3 branch while rebasing a PR. I didn't notice this and merged everything p to the master branch. This means that every branch no includes the 3.0 version. The commit causing trouble is:fefc8a0 and139e2e7

I've tried to revert all merges and revert the troubled merges. This doesn't work correctly though, as it means we have to revert all 2.3...3.0 changes in 2.3. When merging 2.3 to 2.7, all 2.3...3.0 changes are still removed and 2.7 becomes the 2.3 docs.

At the moment, I have the feeling that a hard reset + force push is the only solution to this problem.

@stof do you may have a clue on how to fix this?