bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-28 06:03:40 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/bitwarden/browser into feature/desktop-bridge

Browse Source 
# Conflicts:
#	src/_locales/en/messages.json
This commit is contained in:
Hinton
2020-11-16 10:07:54 +01:00
parent c1b099f5da 90ad1847e7
commit 0a29b30b99
58 changed files with 2446 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -6,7 +6,7 @@
"sub:update": "git submodule update --remote",
"sub:pull": "git submodule foreach git pull origin master",
"postinstall": "npm run sub:init",
"symlink:win": "rmdir /S /Q ./jslib && cmd /c mklink /J .\\jslib ..\\jslib",
"symlink:win": "rmdir /S /Q .\\jslib && cmd /c mklink /J .\\jslib ..\\jslib",
"symlink:mac": "npm run symlink:lin",
"symlink:lin": "rm -rf ./jslib && ln -s ../jslib ./jslib",
"build": "gulp build && webpack",