Merge remote-tracking branch 'origin/master' into shim-webcrypto

This commit is contained in:
Danny Coates 2017-08-04 14:44:11 -07:00
commit 02fc4d74db
No known key found for this signature in database
GPG key ID: 4C442633C62E00CB
21 changed files with 204 additions and 40 deletions

View file

@ -86,6 +86,7 @@
"build:download": "browserify frontend/src/download.js -g uglifyify -o public/download.js",
"build:version": "node scripts/version",
"build:vendor": "cp node_modules/l20n/dist/web/l20n.min.js node_modules/babel-polyfill/dist/polyfill.min.js public",
"contributors": "git shortlog -s -n | awk -F\\t '{print $2}' > CONTRIBUTORS",
"dev": "npm run build && npm start",
"format": "prettier '{frontend/src/,scripts/,server/,test/**/!(bundle)}*.js' 'public/*.css' --single-quote --write",
"get-prod-locales": "node scripts/get-prod-locales",