# 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>

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

)

---
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 [eslint](https://github.com/eslint/eslint) from 8.23.0 to 8.28.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.23.0...v8.28.0

)

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

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

build(deps): Bump loader-utils from 1.4.0 to 1.4.2

build(deps): Bump core-js from 3.25.0 to 3.26.1

build(deps-dev): Bump electron-packager from 15.5.1 to 17.1.1

build(deps): Bump actions/setup-node from 3.4.1 to 3.5.1

Merge pull request #221 from Griefed/dependabot-github_actions-dependabot-JamesIves-github-pages-deploy-action-4.4.1

build(deps): Bump JamesIves/github-pages-deploy-action from 4.4.0 to 4.4.1

chore(deps): update jamesives/github-pages-deploy-action action to v4.4.1

See merge request !109

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

See merge request !108

Bumps [electron](https://github.com/electron/electron) from 19.0.8 to 19.0.11.
- [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/v19.0.8...v19.0.11

)

---
updated-dependencies:
- dependency-name: electron
  dependency-type: direct:development
...

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

Bumps lsiobase/nginx from 3.15 to 3.16.

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

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

Bumps [loader-utils](https://github.com/webpack/loader-utils) from 1.4.0 to 1.4.2.
- [Release notes](https://github.com/webpack/loader-utils/releases)
- [Changelog](https://github.com/webpack/loader-utils/blob/v1.4.2/CHANGELOG.md)
- [Commits](https://github.com/webpack/loader-utils/compare/v1.4.0...v1.4.2

)

---
updated-dependencies:
- dependency-name: loader-utils
  dependency-type: indirect
...

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

Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.25.0 to 3.26.1.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/commits/v3.26.1/packages/core-js

)

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

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

Bumps [electron-packager](https://github.com/electron/electron-packager) from 15.5.1 to 17.1.1.
- [Release notes](https://github.com/electron/electron-packager/releases)
- [Changelog](https://github.com/electron/electron-packager/blob/main/NEWS.md)
- [Commits](https://github.com/electron/electron-packager/compare/v15.5.1...v17.1.1

)

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

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

Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3.4.1 to 3.5.1.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v3.4.1...v3.5.1

)

---
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>

Bumps [JamesIves/github-pages-deploy-action](https://github.com/JamesIves/github-pages-deploy-action) from 4.4.0 to 4.4.1.
- [Release notes](https://github.com/JamesIves/github-pages-deploy-action/releases)
- [Commits](https://github.com/JamesIves/github-pages-deploy-action/compare/v4.4.0...v4.4.1

)

---
updated-dependencies:
- dependency-name: JamesIves/github-pages-deploy-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

chore(deps): pin dependencies

See merge request !106

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

See merge request !104

chore(deps): update dependency electron-packager to v15.5.2

See merge request !105