Well, I didn't actually discuss it with her face to face, but I did put everything down in an email the day before and sent that to her. I warned her beforehand that I would do so. Of course, as I suspected, she ran straight to the manager with it because it upset her.
I thought we could leave her out of that, but no. The manager wanted us to discuss everything in her presence, but I declined because I was still far too upset at that moment and by now I think there is no point. We can still work together without a problem so no need to bring it up. It may be awkward for a few days, but that's about it. For my part, I think we are even now.
Today, in better news, I went to Yo!Sushi (spent loads there again
) and then went shopping. Found some lovely new shoes I had been trying to find for years. Also bought some other essentials, but I mostly like the shoes. I also wanted to get some comfy shoes, but they only came in colours I didn't like. I will try to get them later this weekend.