Skip to content

Commit

Permalink
Merge pull request #50 from evansiroky/dev
Browse files Browse the repository at this point in the history
Merge dev into master
  • Loading branch information
evansiroky authored Feb 11, 2017
2 parents 374c91d + 07fbbb7 commit d477889
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 9 deletions.
5 changes: 4 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -79,5 +79,8 @@ $RECYCLE.BIN/
*.lnk

# project exclusions
downloads
.gitattributes
data.zip
downloads
scripts
tests
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,18 @@
"updateTzData": "node scripts/update-data.js"
},
"devDependencies": {
"async": "^2.0.0-rc.5",
"async": "^2.1.4",
"chai": "^3.5.0",
"codeclimate-test-reporter": "^0.4.0",
"cz-conventional-changelog": "^1.1.6",
"follow-redirects": "^1.0.0",
"fs-extra": "^1.0.0",
"follow-redirects": "^1.2.1",
"fs-extra": "^2.0.0",
"istanbul": "^0.4.2",
"jsts": "^1.1.2",
"lodash": "^4.11.2",
"jsts": "^1.3.0",
"lodash": "^4.17.4",
"mkdirp": "^0.5.1",
"mocha": "^3.0.0",
"nock": "^9.0.0",
"mocha": "^3.2.0",
"nock": "^9.0.5",
"rimraf": "^2.5.2",
"semantic-release": "^6.3.2",
"turf-featurecollection": "^1.0.1",
Expand All @@ -51,7 +51,7 @@
"dependencies": {
"geobuf": "^3.0.0",
"moment-timezone": "0.5.11",
"pbf": "^3.0.2",
"pbf": "^3.0.5",
"turf-inside": "^3.0.5",
"turf-point": "^2.0.0"
},
Expand Down

0 comments on commit d477889

Please sign in to comment.