Prepare 2.6.0 release

geocoder-php · Sep 2, 2014 · aeae3a5 · aeae3a5
1 parent b170e11
commit aeae3a5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,16 @@
 CHANGELOG
 =========
 
-### 2.5.1 (????-??-??) ###
-
-n/a
+### 2.6.0 (2014-09-02) ###
+
+* Added: `region` and `regionCode` to GeoIP2Provider
+* Added: throw `InvalidCredentialsException` with GoogleMapsBusinessProvider
+* Added: support in MapQuestProvider for licensed endpoints (#318)
+* Added: it is now possible to set the user agent in `CurlHttpAdapter`
+* Fixed: google maps provider test
+* Fixed: GeoPlugin returns 206 for anonymous proxies
+* Removed: Google's sensor parameter
+* Updated: Travis-CI config, doc, tests
 
 ### 2.5.0 (2014-05-16) ###
 

diff --git a/composer.json b/composer.json
@@ -35,7 +35,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.5-dev"
+            "dev-master": "2.6-dev"
         }
     }
 }
diff --git a/src/Geocoder/Geocoder.php b/src/Geocoder/Geocoder.php
@@ -22,7 +22,7 @@ class Geocoder implements GeocoderInterface
     /**
      * Version
      */
-    const VERSION = '2.5.1-dev';
+    const VERSION = '2.6.0';
 
     /**
      * @var integer