Merge branch 'master' into 'facility-cards'
# Conflicts: # public/index.html
... | ... | @@ -8,12 +8,16 @@ |
"fuzzysearch": "^1.0.3", | ||
"history": "^4.6.3", | ||
"immutability-helper": "^2.3.0", | ||
"mapbox": "^1.0.0-beta9", | ||
"mapbox-gl": "^0.40.1", | ||
"material-ui": "next", | ||
"material-ui-icons": "^1.0.0-alpha.19", | ||
"prop-types": "^15.5.10", | ||
"react": "^15.6.1", | ||
"react-autosuggest": "^9.3.2", | ||
"react-classnames": "^0.1.2", | ||
"react-dom": "^15.6.1", | ||
"react-mapbox-gl": "^2.5.2", | ||
"react-redux": "^5.0.5", | ||
"react-router-dom": "^4.1.2", | ||
"react-router-redux": "next", | ||
... | ... |
src/images/WKschedule.svg
0 → 100644
src/images/starbucksSVG.svg
0 → 100644