"src/main/webapp/static/ms-admin/4.7.2/iconfont/iconfont.json" did not exist on "ffc3e38596a699ab0ea8b8d4e2380bb444a6c384"
Commit 0f84a447 authored by Mike Street's avatar Mike Street
Browse files

Merge branch 'leemark-patch-1'

parents 13f46c7f 7666b7e8
......@@ -105,6 +105,7 @@ A collective list of JSON APIs for use in web development.
| API | Description | OAuth |Link |
|---|---|---|---|
| OpenCage | Forward and reverse geocoding using open data | No | [Go!](https://geocoder.opencagedata.com) |
<<<<<<< HEAD
| Google Maps API | Create/customize digital maps based on Google Maps data | No, but `apiKey` query string | [Go!](https://developers.google.com/maps/) |
| Mapbox | Create/customize beautiful digital maps | No, but `apiKey` query string | [Go!](https://www.mapbox.com/developers/) |
| IP Address Details| Find geolocation with ip address | No | [Go!](https://ipinfo.io/) |
......@@ -121,6 +122,9 @@ A collective list of JSON APIs for use in web development.
| API | Description | OAuth |Link |
|---|---|---|---|
| Nutritionix | Worlds largest verified nutrition database | No, but `apiKey` query string | [Go!](https://developer.nutritionix.com/) |
=======
| GeoNames | Place names and other geographical data | No | [Go!](http://www.geonames.org/export/web-services.html) |
>>>>>>> 71ffc2ce0827cc9070d29d6426b495d221bada8c
### Media
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment