Prepare v1.1.0 release

clue · Mar 9, 2016 · ed70f8d · ed70f8d
1 parent 656c5fd
commit ed70f8d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## 1.1.0 (2016-03-09)
+
+* Feature: Add optional timeout parameter to all await*() functions
+  (#17 by @clue)
+
+* Feature: Cancellation is now supported across all PHP versions
+  (#16 by @clue)
+
 ## 1.0.0 (2015-11-13)
 
 * First stable release, now following SemVer

diff --git a/README.md b/README.md
@@ -193,13 +193,15 @@ triggers, this will `cancel()` all pending promises and throw a `TimeoutExceptio
 
 ## Install
 
-The recommended way to install this library is [through composer](http://getcomposer.org).
-[New to composer?](http://getcomposer.org/doc/00-intro.md)
+The recommended way to install this library is [through Composer](http://getcomposer.org).
+[New to Composer?](http://getcomposer.org/doc/00-intro.md)
 
 ```bash
-$ composer require clue/block-react:~1.0
+$ composer require clue/block-react:^1.1
 ```
 
+See also the [CHANGELOG](CHANGELOG.md) for details about version upgrades.
+
 ## License
 
 MIT