Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
PAXANDDOS committed Feb 10, 2022
2 parents fab5cda + 6f3dbc5 commit a5b972a
Show file tree
Hide file tree
Showing 44 changed files with 6,433 additions and 13,135 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ typings/
# Output of 'npm pack'
*.tgz

# Yarn Integrity file
# Yarn files
.yarn
.yarn-integrity

# dotenv environment variables file
Expand Down
5 changes: 4 additions & 1 deletion .prettierrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,8 @@
"semi": false,
"useTabs": true,
"tabWidth": 4,
"trailingComma": "es5"
"trailingComma": "es5",
"printWidth": 100,
"quoteProps": "as-needed",
"arrowParens": "avoid"
}
2 changes: 2 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
yarnPath: .yarn/releases/yarn-3.1.1.cjs
nodeLinker: node-modules
Binary file added build/installerHeader.bmp
Binary file not shown.
Binary file added build/installerSidebar.bmp
Binary file not shown.
Loading

0 comments on commit a5b972a

Please sign in to comment.