mirror of
https://github.com/movie-web/simple-proxy.git
synced 2025-09-13 08:33:26 +00:00
Merge branch 'dev' into dev
This commit is contained in:
2
.github/workflows/linting_testing.yml
vendored
2
.github/workflows/linting_testing.yml
vendored
@@ -5,7 +5,7 @@ on:
|
||||
branches:
|
||||
- master
|
||||
- dev
|
||||
pull_request:
|
||||
pull_request_target:
|
||||
types: [opened, reopened, synchronize]
|
||||
|
||||
jobs:
|
||||
|
3
.vscode/settings.json
vendored
3
.vscode/settings.json
vendored
@@ -1,4 +1,5 @@
|
||||
{
|
||||
"editor.formatOnSave": true,
|
||||
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
|
||||
"editor.defaultFormatter": "dbaeumer.vscode-eslint",
|
||||
"eslint.format.enable": true
|
||||
}
|
||||
|
Reference in New Issue
Block a user