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

Update dependency quasar to v2.6.6

See merge request !118

Update dependency eslint to v8.14.0

See merge request !117

Update dependency electron to v17.4.2

See merge request !116

Update dependency @quasar/extras to v1.13.6

See merge request !115

Update actions/setup-node action to v3.1.1

See merge request !114

Update spring boot to v2.6.7

See merge request !113

Update plugin edu.sc.seis.launch4j to v2.5.3

See merge request !112

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

See merge request !111

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

See merge request !110

Update dependency org.apache.logging.log4j:log4j-slf4j-impl to v2.17.2

See merge request !104

# Conflicts:
#   build.gradle

Update actions/checkout action to v3

See merge request !108

Update dependency org.apache.logging.log4j:log4j-web to v2.17.2

See merge request !105

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

See merge request !101

# Conflicts:
#   build.gradle

# Conflicts:
#   build.gradle

Update actions/upload-artifact action to v3

See merge request !109

Update dependency tsparticles to v1.42.4

See merge request !107

Update dependency eslint-config-prettier to v8.5.0

See merge request !106

Update dependency gradle to v7.4.2

See merge request !100

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

See merge request !103

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

See merge request !102

Update dependency axios to v0.26.1

See merge request !99