# Conflicts:
#	frontend/package-lock.json
#	frontend/package.json

Update dependency org.apache.logging.log4j:log4j-core to v2.18.0

See merge request !138

Update dependency electron to v18.3.5

See merge request !134

Merge branch 'renovate-eslint-plugin-vue-9.x' of https://git.griefed.de/prosper/docker-template-repo

# Conflicts:
#	frontend/package-lock.json
#	frontend/package.json

# Conflicts:
#	frontend/package-lock.json
#	frontend/package.json

# Conflicts:
#   frontend/package.json

Update spring boot to v2.7.1

See merge request !143

Update dependency org.apache.logging.log4j:log4j-jul to v2.18.0

See merge request !139

# Conflicts:
#   build.gradle

Update dependency org.apache.logging.log4j:log4j-api to v2.18.0

See merge request !137

Update dependency eslint-webpack-plugin to v3.2.0

See merge request !136

Update dependency eslint to v8.19.0

See merge request !135

# Conflicts:
#   frontend/package.json

Update dependency core-js to v3.23.3

See merge request !133

Update dependency @quasar/extras to v1.14.2

See merge request !132

Update dependency @babel/eslint-parser to v7.18.2

See merge request !131

Update actions/setup-node action to v3.3.0

See merge request !130

Bump actions/setup-node from 3.1.1 to 3.3.0

Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3.1.1 to 3.3.0.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v3.1.1...v3.3.0

)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

# Conflicts:
#	.github/workflows/test.yml

Update dependency griefed/gitlab-ci-cd to v2.0.8

See merge request !129

Update dependency griefed/baseimage-ubuntu-jdk-8 to v2.0.11

See merge request !128

Merge pull request #12 from Griefed/dependabot-github_actions-dependabot-docker-setup-buildx-action-2

Bump docker/setup-buildx-action from 1 to 2

Bump docker/setup-qemu-action from 1 to 2