-
Notifications
You must be signed in to change notification settings - Fork 57
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master'
# Conflicts: # app/appx/AppxManifest.xml # app/package.json # kernel/go.mod # kernel/util/working.go
- Loading branch information
Showing
199 changed files
with
19,986 additions
and
9,018 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,10 +14,10 @@ Install pnpm: `npm install -g [email protected]` | |
|
||
Set the Electron mirror environment variable and install Electron: | ||
|
||
* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@v30.5.1 -D` | ||
* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@v32.2.0 -D` | ||
* Windows: | ||
* `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/` | ||
* `pnpm install electron@v30.5.1 -D` | ||
* `pnpm install electron@v32.2.0 -D` | ||
|
||
NPM mirror: | ||
|
||
|
@@ -28,7 +28,7 @@ NPM mirror: | |
|
||
On the desktop, go to the app folder to run: | ||
|
||
* `pnpm install electron@v30.5.1 -D` | ||
* `pnpm install electron@v32.2.0 -D` | ||
* `pnpm run dev` | ||
* `pnpm run start` | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.