Merge branch 'master' of https://bitbucket.org/sco44/tecnologiabanana

2018-12-12 19:12:57 +01:00
parent e1d427ed45 5ff198adc3
commit 8b54f673ee
5 changed files with 137 additions and 30 deletions
@@ -3,9 +3,16 @@
  "version": "0.1.0",
  "private": true,
  "dependencies": {
+<<<<<<< HEAD
    "axios": "latest",
+=======
+    "axios": "^0.18.0",
+    "body-parser": "^1.18.3",
+>>>>>>> 5ff198adc326a86bc0742f4beeb603992ad7ed5c
    "bootstrap": "^4.1.3",
    "express": "^4.16.4",
+    "lodash-id": "^0.14.0",
+    "lowdb": "^1.0.0",
    "react": "^16.6.1",
    "react-app-polyfill": "^0.1.3",
    "react-bootstrap": "^1.0.0-beta.2",