mmattel
commented
3 days ago The problem was only in the back-ports. When back-porting, conflicts need to be correctly resolved.
I think it was not my day and assumed that the issue origined in the master merge whithout taking a closer look. BP never had such a problem before...
You can close that PR and delete the branch if all is fine. Back in duty on the 1st 😄 👋
Reverts owncloud/docs-server#1327
There was a conflict issue where old text sneaked in that was formerly removed. The backports need to be deleted too and the language fixes need to be redone post merging.
@phil-davis Sorry for the inconvinience...