Merge branch 'develop'

This commit is contained in:
SamTV12345 2024-08-09 11:40:31 +02:00
commit 96fe9768b1
6 changed files with 6 additions and 5 deletions

View file

@ -14,6 +14,7 @@ permissions:
jobs: jobs:
build-zip: build-zip:
permissions: write-all
# run on pushes to any branch # run on pushes to any branch
# run on PRs from external forks # run on PRs from external forks
if: | if: |

View file

@ -1,4 +1,4 @@
# 2.2.1 # 2.2.2
### Notable enhancements and fixes ### Notable enhancements and fixes

View file

@ -1,7 +1,7 @@
{ {
"name": "admin", "name": "admin",
"private": true, "private": true,
"version": "2.2.1", "version": "2.2.2",
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",

View file

@ -1,6 +1,6 @@
{ {
"name": "bin", "name": "bin",
"version": "2.2.1", "version": "2.2.2",
"description": "", "description": "",
"main": "checkAllPads.js", "main": "checkAllPads.js",
"directories": { "directories": {

View file

@ -49,6 +49,6 @@
"type": "git", "type": "git",
"url": "https://github.com/ether/etherpad-lite.git" "url": "https://github.com/ether/etherpad-lite.git"
}, },
"version": "2.2.1", "version": "2.2.2",
"license": "Apache-2.0" "license": "Apache-2.0"
} }

View file

@ -134,6 +134,6 @@
"test-admin:ui": "cross-env NODE_ENV=production npx playwright test tests/frontend-new/admin-spec --ui --workers 1", "test-admin:ui": "cross-env NODE_ENV=production npx playwright test tests/frontend-new/admin-spec --ui --workers 1",
"debug:socketio": "cross-env DEBUG=socket.io* node --require tsx/cjs node/server.ts" "debug:socketio": "cross-env DEBUG=socket.io* node --require tsx/cjs node/server.ts"
}, },
"version": "2.2.1", "version": "2.2.2",
"license": "Apache-2.0" "license": "Apache-2.0"
} }