Skip to content

Commit

Permalink
merge version4 upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
Scott Farley committed Mar 18, 2019
2 parents 5ff3272 + 2e625d9 commit c32841e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
## Unreleased
- Localize placeholder based on language set in constructor options [#150](https://github.com/mapbox/mapbox-gl-geocoder/issues/150)
- `trackProximity` turned on by default [#195](https://github.com/mapbox/mapbox-gl-geocoder/issues/195)
- Bump suggestions to v1.3.4

## v3.1.4

Expand Down
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"request": "^2.88.0",
"sinon": "^7.2.3",
"subtag": "^0.5.0",
"suggestions": "^1.3.2",
"suggestions": "^1.3.4",
"xtend": "^4.0.1"
}
}

0 comments on commit c32841e

Please sign in to comment.