Auto stash before merge of "alex" and "origin/alex"

Drakota · May 5, 2018 · 419d366 · 419d366
1 parent adf2727
commit 419d366
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,3 +19,6 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+
+package-lock.json
+
diff --git a/package.json b/package.json
@@ -11,6 +11,7 @@
     "mapbox": "^1.0.0-beta10",
     "mapbox-gl": "^0.45.0-beta.1",
     "react": "^16.3.2",
+    "react-avatar": "^2.5.1",
     "react-dom": "^16.3.2",
     "react-drag-drawer": "^3.2.0",
     "react-geolocated": "^2.3.2",