From: Dan Brown <redacted>
Date: Wed, 3 May 2023 10:03:29 +0000 (+0100)
Subject: Merge branch 'development' into release
X-Git-Tag: v23.05~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/0f895668a4eb0f9af7b23f71906636e3427e62c2?hp=-c

Merge branch 'development' into release
---

0f895668a4eb0f9af7b23f71906636e3427e62c2
diff --combined .gitignore
index 615013ff7,bdc523530..ede4fe296
--- a/.gitignore
+++ b/.gitignore
@@@ -1,14 -1,16 +1,16 @@@
  /vendor
  /node_modules
+ /.vscode
+ /composer
  Homestead.yaml
  .env
  .idea
  npm-debug.log
  yarn-error.log
 -/public/dist
 +/public/dist/*.map
  /public/plugins
 -/public/css
 -/public/js
 +/public/css/*.map
 +/public/js/*.map
  /public/bower
  /public/build/
  /public/favicon.ico
@@@ -21,8 -23,10 +23,10 @@@ yarn.loc
  nbproject
  .buildpath
  .project
+ .nvmrc
  .settings/
  webpack-stats.json
  .phpunit.result.cache
  .DS_Store
- phpstan.neon
+ phpstan.neon
+ esbuild-meta.json