mirror of https://github.com/keeweb/keeweb.git
fix after merge
This commit is contained in:
parent
10a0aa75f0
commit
204965a693
|
@ -2,7 +2,6 @@ workspace.xml
|
||||||
misc.xml
|
misc.xml
|
||||||
.DS_Store
|
.DS_Store
|
||||||
node_modules/
|
node_modules/
|
||||||
bower_components/
|
|
||||||
*.log
|
*.log
|
||||||
dist/
|
dist/
|
||||||
tmp/
|
tmp/
|
||||||
|
|
10
Gruntfile.js
10
Gruntfile.js
|
@ -62,6 +62,16 @@ module.exports = function(grunt) {
|
||||||
resolve: {
|
resolve: {
|
||||||
modules: [path.join(__dirname, 'app/scripts'), path.join(__dirname, 'node_modules')],
|
modules: [path.join(__dirname, 'app/scripts'), path.join(__dirname, 'node_modules')],
|
||||||
alias: {
|
alias: {
|
||||||
|
backbone: 'backbone/backbone-min.js',
|
||||||
|
underscore: 'underscore/underscore-min.js',
|
||||||
|
_: 'underscore/underscore-min.js',
|
||||||
|
jquery: 'jquery/dist/jquery.min.js',
|
||||||
|
kdbxweb: 'kdbxweb/dist/kdbxweb.js',
|
||||||
|
baron: 'baron/baron.min.js',
|
||||||
|
pikaday: 'pikaday/pikaday.js',
|
||||||
|
filesaver: 'FileSaver.js/FileSaver.min.js',
|
||||||
|
qrcode: 'jsqrcode/dist/qrcode.min.js',
|
||||||
|
'argon2': 'argon2-browser/docs/dist/argon2.min.js',
|
||||||
hbs: 'handlebars/runtime.js',
|
hbs: 'handlebars/runtime.js',
|
||||||
'argon2-wasm': 'argon2-browser/dist/argon2.wasm',
|
'argon2-wasm': 'argon2-browser/dist/argon2.wasm',
|
||||||
templates: path.join(__dirname, 'app/templates')
|
templates: path.join(__dirname, 'app/templates')
|
||||||
|
|
|
@ -1,7 +0,0 @@
|
||||||
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
|
|
||||||
# yarn lockfile v1
|
|
||||||
|
|
||||||
|
|
||||||
node-stream-zip@^1.4.2:
|
|
||||||
version "1.7.0"
|
|
||||||
resolved "https://registry.yarnpkg.com/node-stream-zip/-/node-stream-zip-1.7.0.tgz#26f766f6b34be00ba5bbe5d32a810feddb24f779"
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue