Skip to content

Commit

Permalink
Merge branch 'master' of github.com:mapbox/tilelive-vector into lookback
Browse files Browse the repository at this point in the history
  • Loading branch information
dnomadb committed Apr 20, 2016
2 parents 3a68e79 + e282cee commit 290385d
Show file tree
Hide file tree
Showing 69 changed files with 622,419 additions and 161,015 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"aws-sdk": "^2.2.30",
"d3-queue": "^2.0.3",
"s3urls": "^1.3.0",
"mapnik": "~3.5.8",
"mapnik": "~3.5.13",
"tilelive": "~5.12.0",
"tiletype": "0.3.x",
"tar": "~2.2.1",
Expand Down
Binary file modified test/expected/a.0.0.0.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 290385d

Please sign in to comment.