I rebased the branches yet again, and tested them with a fresh install on a virtual machine. All tests pass, and the OPAC and staff client work.
I rebased the branches yet again, and tested them with a fresh install on a virtual machine. All tests pass, and the OPAC and staff client work.