Skip to content

Merge `master` into `30-integrate-firestore`

Adam Alton requested to merge merge-master-to-30-integrate-firestore into 30-integrate-firestore

Just keeping 30-integrate-firestore up to date with master.

After screwing up the merge conflict resolution the first time, I've now redone this. Hopefully it will be good this time and all the tests will pass 🤞

Edited by Adam Alton

Merge request reports