OK,
1. There is still an invisible conflict per above (when I tried merging this myself).
2. I can't seem to test it for reasons unrelated to this branch (bug 1703747).
« Back to merge proposal
OK,
1. There is still an invisible conflict per above (when I tried merging this myself).
2. I can't seem to test it for reasons unrelated to this branch (bug 1703747).