Skip to content

Commit

Permalink
Merge remote-tracking branch 'hangy/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
hangy committed May 27, 2019
2 parents 247f83b + 164d37c commit 53af43d
Show file tree
Hide file tree
Showing 2 changed files with 334 additions and 207 deletions.
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"@bower_components/leaflet": "Leaflet/Leaflet#>=1.5.1",
"@bower_components/leaflet.markercluster": "Leaflet/Leaflet.markercluster#>=1.0.0",
"@bower_components/osmtogeojson": "tyrasd/osmtogeojson#^2.2.12",
"@bower_components/papaparse": "mholt/papaparse#^4.3.6",
"@bower_components/papaparse": "mholt/papaparse#^4.6.3",
"ManUp.js": "https://github.com/boyofgreen/ManUp.js.git#*",
"components-jqueryui": "components/jqueryui#^1.12.1",
"foundation-icon-fonts": "zurb/foundation-icon-fonts#*",
Expand All @@ -58,15 +58,15 @@
"leaflet.markercluster": "Leaflet/Leaflet.markercluster#>=1.0.0",
"opencollective-postinstall": "^2.0.1",
"osmtogeojson": "tyrasd/osmtogeojson#^2.2.12",
"papaparse": "mholt/papaparse#^4.3.6",
"papaparse": "mholt/papaparse#^4.6.3",
"yarn": "^1.2.1",
"opencollective": "^1.0.3"
},
"devDependencies": {
"eslint": "^5.6.1",
"stylelint": "^9.6.0",
"stylelint-config-recommended-scss": "^3.2.0",
"stylelint-scss": "^3.3.1"
"stylelint": "^9.10.1",
"stylelint-config-recommended-scss": "^3.3.0",
"stylelint-scss": "^3.6.1"
},
"engines": {
"yarn": ">= 1.0.0"
Expand Down
Loading

0 comments on commit 53af43d

Please sign in to comment.