Merging develop to master in preparation for 1.3.0 release.

Author: weierophinney

CHANGELOG.md

@@ -4,11 +4,12 @@ All notable changes to this project will be documented in this file, in reverse
 
 Versions prior to 0.4.0 were released as the package "weierophinney/hal".
 
-## 1.2.1 - TBD
+## 1.3.0 - 2019-02-06
 
 ### Added
 
-- Nothing.
+- [#55](https://github.com/zendframework/zend-expressive-hal/pull/55) adds the ability to generate paginated HAL collections from
+  `Doctrine\ORM\Tools\Pagination\Paginator` instances.
 
 ### Changed
 

composer.json

@@ -31,6 +31,7 @@
         "willdurand/negotiation": "^2.3.1"
     },
     "require-dev": {
+        "doctrine/orm": "^2.6",
         "phpunit/phpunit": "^7.0.1",
         "zendframework/zend-coding-standard": "~1.0.0",
         "zendframework/zend-expressive-helpers": "^5.0.0alpha3",
@@ -61,8 +62,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.2.x-dev",
-            "dev-develop": "1.3.x-dev"
+            "dev-master": "1.3.x-dev",
+            "dev-develop": "1.4.x-dev"
         },
         "zf": {
             "config-provider": "Zend\\Expressive\\Hal\\ConfigProvider"