Merge branch 'master' into v1.2.0
Conflicts: lib/geocoder/lookups/base.rb lib/geocoder/lookups/yahoo.rb lib/geocoder/query.rb
No related branches found
No related tags found
Showing
- .travis.yml 4 additions, 0 deletions.travis.yml
- CHANGELOG.rdoc 18 additions, 3 deletionsCHANGELOG.rdoc
- Gemfile 3 additions, 3 deletionsGemfile
- README.md 60 additions, 14 deletionsREADME.md
- lib/geocoder/configuration.rb 1 addition, 1 deletionlib/geocoder/configuration.rb
- lib/geocoder/lookup.rb 30 additions, 11 deletionslib/geocoder/lookup.rb
- lib/geocoder/lookups/base.rb 61 additions, 16 deletionslib/geocoder/lookups/base.rb
- lib/geocoder/lookups/bing.rb 9 additions, 1 deletionlib/geocoder/lookups/bing.rb
- lib/geocoder/lookups/freegeoip.rb 5 additions, 1 deletionlib/geocoder/lookups/freegeoip.rb
- lib/geocoder/lookups/geocoder_ca.rb 9 additions, 1 deletionlib/geocoder/lookups/geocoder_ca.rb
- lib/geocoder/lookups/google.rb 4 additions, 0 deletionslib/geocoder/lookups/google.rb
- lib/geocoder/lookups/google_premier.rb 8 additions, 0 deletionslib/geocoder/lookups/google_premier.rb
- lib/geocoder/lookups/mapquest.rb 33 additions, 4 deletionslib/geocoder/lookups/mapquest.rb
- lib/geocoder/lookups/nominatim.rb 5 additions, 1 deletionlib/geocoder/lookups/nominatim.rb
- lib/geocoder/lookups/test.rb 4 additions, 0 deletionslib/geocoder/lookups/test.rb
- lib/geocoder/lookups/yahoo.rb 34 additions, 4 deletionslib/geocoder/lookups/yahoo.rb
- lib/geocoder/lookups/yandex.rb 9 additions, 1 deletionlib/geocoder/lookups/yandex.rb
- lib/geocoder/models/mongoid.rb 1 addition, 1 deletionlib/geocoder/models/mongoid.rb
- lib/geocoder/request.rb 7 additions, 1 deletionlib/geocoder/request.rb
- lib/geocoder/results/base.rb 8 additions, 2 deletionslib/geocoder/results/base.rb
Loading
Please register or sign in to comment