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

chore(deps): update dependency @quasar/extras to v1.15.9

See merge request !112

build(deps): Bump lsiobase/nginx from 3.16 to 3.17

build(deps-dev): Bump @babel/eslint-parser from 7.18.9 to 7.19.1

build(deps): Bump @quasar/extras from 1.15.6 to 1.15.8

build(deps): Bump quasar from 2.7.7 to 2.11.1

build(deps-dev): Bump eslint from 8.28.0 to 8.30.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.28.0 to 8.30.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.28.0...v8.30.0

)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

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

Bumps [quasar](https://github.com/quasarframework/quasar) from 2.7.7 to 2.11.1.
- [Release notes](https://github.com/quasarframework/quasar/releases)
- [Commits](https://github.com/quasarframework/quasar/compare/quasar-v2.7.7...quasar-v2.11.1

)

---
updated-dependencies:
- dependency-name: quasar
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

chore(deps): update dependency @babel/eslint-parser to v7.19.1

See merge request !110

chore(deps): update dependency eslint to v8.29.0

See merge request !111

Bumps [@quasar/extras](https://github.com/quasarframework/quasar) from 1.15.6 to 1.15.8.
- [Release notes](https://github.com/quasarframework/quasar/releases)
- [Commits](https://github.com/quasarframework/quasar/compare/quasar-v1.15.6...@quasar/extras-v1.15.8

)

---
updated-dependencies:
- dependency-name: "@quasar/extras"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

Bumps [@babel/eslint-parser](https://github.com/babel/babel/tree/HEAD/eslint/babel-eslint-parser) from 7.18.9 to 7.19.1.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.19.1/eslint/babel-eslint-parser

)

---
updated-dependencies:
- dependency-name: "@babel/eslint-parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

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

Bumps lsiobase/nginx from 3.16 to 3.17.

---
updated-dependencies:
- dependency-name: lsiobase/nginx
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

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

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

Merge pull request #246 from Griefed/15e0dependabot/npm_and_yarn/minimatch-and-electron/universal-3.1.2

build(deps): Bump minimatch and @electron/universal

build(deps-dev): Bump electron from 19.0.8 to 19.0.11

build(deps-dev): Bump electron from 20.1.0 to 21.3.1

build(deps): Bump lsiobase/nginx from 3.15 to 3.16

build(deps-dev): Bump eslint from 8.23.0 to 8.28.0

Bumps [electron](https://github.com/electron/electron) from 20.1.0 to 21.3.1.
- [Release notes](https://github.com/electron/electron/releases)
- [Changelog](https://github.com/electron/electron/blob/main/docs/breaking-changes.md)
- [Commits](https://github.com/electron/electron/compare/v20.1.0...v21.3.1

)

---
updated-dependencies:
- dependency-name: electron
  dependency-type: direct:development
  update-type: version-update:semver-major
...

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

build(deps): Bump @quasar/extras from 1.15.2 to 1.15.6

Bumps [minimatch](https://github.com/isaacs/minimatch) and [@electron/universal](https://github.com/electron/universal). These dependencies needed to be updated together.

Updates `minimatch` from 3.0.4 to 3.1.2
- [Release notes](https://github.com/isaacs/minimatch/releases)
- [Commits](https://github.com/isaacs/minimatch/compare/v3.0.4...v3.1.2)

Updates `@electron/universal` from 1.3.0 to 1.3.4
- [Release notes](https://github.com/electron/universal/releases)
- [Changelog](https://github.com/electron/universal/blob/main/.releaserc.json)
- [Commits](https://github.com/electron/universal/compare/v1.3.0...v1.3.4

)

---
updated-dependencies:
- dependency-name: minimatch
  dependency-type: indirect
- dependency-name: "@electron/universal"
  dependency-type: indirect
...

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