Updated CHANGELOG and branch-alias for 2.5.0 release

ramsey · Oct 30, 2013 · 4b0bd0f · 4b0bd0f
1 parent e997496
commit 4b0bd0f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+* 2.5.0 (2013-10-30)
+  * Using `openssl_random_pseudo_bytes()`, if available, to generate random bytes, by merging in PR #15 from @dfreudenberger
+  * Fixed test for Rhumsaa\Uuid\Doctrine\UuidType, by merging in PR #17 from @dfreudenberger
+  * Documentation fixes
 * 2.4.0 (2013-07-29)
   * `Uuid::getVersion()` now returns null if the UUID isn't an RFC 4122 variant
   * `Uuid::fromString()` now supports a 128-bit integer formatted as a hexadecimal string (UUID without dashes)

diff --git a/composer.json b/composer.json
@@ -36,7 +36,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.4.x-dev"
+            "dev-master": "2.5.x-dev"
         }
     }
 }