diff options
author | kytwb <kytwb@pm.me> | 2022-01-08 13:22:33 +0100 |
---|---|---|
committer | kytwb <kytwb@pm.me> | 2022-01-08 13:22:33 +0100 |
commit | c70679b2c8572b7c0f5aa5df9c847884c29e1aed (patch) | |
tree | 23a681f887936d412ea35bc0a6e4f54a778956ab /package.json | |
parent | 5.6.9-nightly.2 [skip ci] (diff) | |
parent | Fix and run add-crowdin-contributors (diff) | |
download | ferdium-app-c70679b2c8572b7c0f5aa5df9c847884c29e1aed.tar.gz ferdium-app-c70679b2c8572b7c0f5aa5df9c847884c29e1aed.tar.zst ferdium-app-c70679b2c8572b7c0f5aa5df9c847884c29e1aed.zip |
Merge branch 'develop' into nightly
# Conflicts:
# src/internal-server/app/Controllers/Http/RecipeController.js
Diffstat (limited to 'package.json')
-rw-r--r-- | package.json | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/package.json b/package.json index 62eb589db..321b585cf 100644 --- a/package.json +++ b/package.json | |||
@@ -33,9 +33,8 @@ | |||
33 | "build": "electron-builder", | 33 | "build": "electron-builder", |
34 | "contributors": "all-contributors", | 34 | "contributors": "all-contributors", |
35 | "reformat-files": "./node_modules/.bin/prettier --ignore-path .eslintignore --write --require-pragma \"**/*.{js,jsx,scss}\"", | 35 | "reformat-files": "./node_modules/.bin/prettier --ignore-path .eslintignore --write --require-pragma \"**/*.{js,jsx,scss}\"", |
36 | "apply-branding": "ts-node ./src/i18n/apply-branding.ts", | ||
37 | "update-submodules": "git submodule update --init --recursive --remote --rebase --force", | 36 | "update-submodules": "git submodule update --init --recursive --remote --rebase --force", |
38 | "prepare-code": "npm run lint:fix && npm run reformat-files && npm run manage-translations && npm run apply-branding", | 37 | "prepare-code": "npm run lint:fix && npm run reformat-files && npm run manage-translations", |
39 | "link-readme": "ts-node scripts/link-readme.ts", | 38 | "link-readme": "ts-node scripts/link-readme.ts", |
40 | "minify-images": "./scripts/minify-images.sh", | 39 | "minify-images": "./scripts/minify-images.sh", |
41 | "start:server": "ts-node src/internal-server/test.ts", | 40 | "start:server": "ts-node src/internal-server/test.ts", |