r/p5.js-web-editor
1
0
Fork 0
Code Issues 1 Pull requests Releases 1 Wiki Activity

fix merge conflicts

Browse source
This commit is contained in:
Cassie Tarakajian 2019-01-16 12:38:32 -05:00
commit f7e80eca96
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
package.json
View file

@ -32,7 +32,7 @@
"babel-plugin-transform-react-inline-elements": "^6.8.0", "babel-plugin-transform-react-inline-elements": "^6.8.0",
"babel-plugin-transform-react-remove-prop-types": "^0.2.6", "babel-plugin-transform-react-remove-prop-types": "^0.2.6",
"babel-plugin-webpack-loaders": "^0.9.0", "babel-plugin-webpack-loaders": "^0.9.0",
"babel-preset-env": "^1.6.1", "babel-preset-env": "^1.7.0",
"babel-preset-react": "^6.5.0", "babel-preset-react": "^6.5.0",
"babel-preset-react-optimize": "^1.0.1", "babel-preset-react-optimize": "^1.0.1",
"babel-preset-stage-0": "^6.5.0", "babel-preset-stage-0": "^6.5.0",
@ -47,7 +47,7 @@
"extract-text-webpack-plugin": "^3.0.2", "extract-text-webpack-plugin": "^3.0.2",
"file-loader": "^2.0.0", "file-loader": "^2.0.0",
"node-sass": "^4.11.0", "node-sass": "^4.11.0",
"nodemon": "^1.9.2", "nodemon": "^1.18.9",
"postcss-cssnext": "^2.7.0", "postcss-cssnext": "^2.7.0",
"postcss-focus": "^1.0.0", "postcss-focus": "^1.0.0",
"postcss-loader": "^0.9.1", "postcss-loader": "^0.9.1",
@ -65,18 +65,18 @@
"archiver": "^1.1.0", "archiver": "^1.1.0",
"async": "^2.0.0", "async": "^2.0.0",
"axios": "^0.12.0", "axios": "^0.12.0",
"babel-core": "^6.26.0", "babel-core": "^6.26.3",
"babel-polyfill": "^6.8.0", "babel-polyfill": "^6.8.0",
"babel-register": "^6.8.0", "babel-register": "^6.26.0",
"bcrypt-nodejs": "0.0.3", "bcrypt-nodejs": "0.0.3",
"blob-util": "^1.2.1", "blob-util": "^1.2.1",
"body-parser": "^1.15.1", "body-parser": "^1.18.3",
"bson-objectid": "^1.1.4", "bson-objectid": "^1.1.4",
"classnames": "^2.2.5", "classnames": "^2.2.5",
"clipboard": "^1.7.1", "clipboard": "^1.7.1",
"codemirror": "^5.38.0", "codemirror": "^5.38.0",
"connect-mongo": "^1.2.0", "connect-mongo": "^1.2.0",
"console-feed": "^2.8.1", "console-feed": "^2.8.5",
"cookie-parser": "^1.4.1", "cookie-parser": "^1.4.1",
"cors": "^2.8.1", "cors": "^2.8.1",
"cross-env": "^5.1.3", "cross-env": "^5.1.3",
@ -86,22 +86,22 @@
"dropzone": "^4.3.0", "dropzone": "^4.3.0",
"escape-string-regexp": "^1.0.5", "escape-string-regexp": "^1.0.5",
"eslint-loader": "^1.3.0", "eslint-loader": "^1.3.0",
"express": "^4.13.4", "express": "^4.16.4",
"express-basic-auth": "^1.1.5", "express-basic-auth": "^1.1.5",
"express-session": "^1.13.0", "express-session": "^1.15.6",
"htmlhint": "^0.9.13", "htmlhint": "^0.10.1",
"is-url": "^1.2.2", "is-url": "^1.2.2",
"js-beautify": "^1.6.4", "js-beautify": "^1.6.4",
"jsdom": "^9.8.3", "jsdom": "^9.8.3",
"jshint": "^2.9.4", "jshint": "^2.9.7",
"lodash": "^4.16.4", "lodash": "^4.17.11",
"loop-protect": "github:catarak/loop-protect", "loop-protect": "github:catarak/loop-protect",
"mjml": "^3.3.2", "mjml": "^3.3.2",
"moment": "^2.14.1", "moment": "^2.14.1",
"mongoose": "^4.6.8", "mongoose": "^4.6.8",
"node-uuid": "^1.4.7", "node-uuid": "^1.4.7",
"nodemailer": "^2.6.4", "nodemailer": "^2.6.4",
"nodemailer-mailgun-transport": "^1.2.2", "nodemailer-mailgun-transport": "^1.4.0",
"passport": "^0.3.2", "passport": "^0.3.2",
"passport-github": "^1.1.0", "passport-github": "^1.1.0",
"passport-google-oauth20": "^1.0.0", "passport-google-oauth20": "^1.0.0",
@ -121,12 +121,12 @@
"react-split-pane": "^0.1.44", "react-split-pane": "^0.1.44",
"react-tabs": "^2.2.1", "react-tabs": "^2.2.1",
"redux": "^3.5.2", "redux": "^3.5.2",
"redux-devtools": "^3.4.1", "redux-devtools": "^3.4.2",
"redux-devtools-dock-monitor": "^1.1.3", "redux-devtools-dock-monitor": "^1.1.3",
"redux-devtools-log-monitor": "^1.4.0", "redux-devtools-log-monitor": "^1.4.0",
"redux-form": "^5.3.3", "redux-form": "^5.3.3",
"redux-thunk": "^2.1.0", "redux-thunk": "^2.1.0",
"request": "^2.76.0", "request": "^2.88.0",
"request-promise": "^4.1.1", "request-promise": "^4.1.1",
"s3": "^4.4.0", "s3": "^4.4.0",
"s3-policy": "^0.2.0", "s3-policy": "^0.2.0",