0.3.25

What's Changed

• build(deps-dev): bump ts-jest from 29.3.1 to 29.3.4 in /graphql-server by @dependabot in #485
• build(deps-dev): bump eslint-plugin-react from 7.37.2 to 7.37.5 in /web by @dependabot in #484
• build(deps): bump typeorm from 0.3.20 to 0.3.24 in /graphql-server by @dependabot in #481
• build(deps-dev): bump @types/cookie-parser from 1.4.8 to 1.4.9 in /graphql-server by @dependabot in #483
• web, graphql: Migrate eslint to v9 by @tbantle22 in #467
• Preview merge conflicts summary before attempting merge by @tbantle22 in #451
• Bump brace-expansion by @tbantle22 in #492
• build(deps-dev): bump eslint-plugin-jest from 28.8.3 to 29.0.1 in /graphql-server by @dependabot in #504
• build(deps-dev): bump postcss-preset-env from 10.1.3 to 10.2.3 in /web by @dependabot in #498
• build(deps-dev): bump eslint-config-next from 15.1.3 to 15.3.4 in /web by @dependabot in #507
• build(deps-dev): bump eslint from 9.28.0 to 9.29.0 in /web by @dependabot in #505
• build(deps-dev): bump typescript from 5.8.2 to 5.8.3 in /graphql-server by @dependabot in #496
• build(deps-dev): bump eslint-plugin-jest from 28.8.3 to 29.0.1 in /web by @dependabot in #506
• build(deps-dev): bump @types/cookie-parser from 1.4.8 to 1.4.9 in /graphql-server by @dependabot in #501
• build(deps-dev): bump webpack from 5.94.0 to 5.99.9 in /graphql-server by @dependabot in #500
• build(deps-dev): bump @typescript-eslint/parser from 8.32.0 to 8.34.1 in /workbench-cypress by @dependabot in #502
• Cypress README, run tests on web and graphql changes by @tbantle22 in #508
• build(deps-dev): bump eslint-config-prettier from 10.1.2 to 10.1.5 in /workbench-cypress by @dependabot in #497
• build(deps-dev): bump npm-run-all2 from 7.0.2 to 8.0.4 in /workbench-cypress by @dependabot in #499
• build(deps-dev): bump @cypress/github-action from 6.9.0 to 6.10.1 in /workbench-cypress by @dependabot in #494
• {web,graphql}: Add pagination to pull row conflicts by @tbantle22 in #509
• web,graphql: UI fixes for merge conflicts table by @tbantle22 in #510
• web: Fix nextron build, some conflicts improvements by @tbantle22 in #513

Full Changelog: v0.3.24...v0.3.25