Merge branch '1.x'

sabre-io · Dec 7, 2016 · 962b4b4 · 962b4b4
2 parents f18d55e + dc8db27
commit 962b4b4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,24 @@ ChangeLog
 
 * Requires PHP 7.
 * Added type-hints where relevant.
+=======
+
+
+1.2.0 (2016-12-06)
+------------------
+
+* Now throwing `InvalidUriException` if a uri passed to the `parse` function
+  is invalid or could not be parsed.
+* #11: Fix support for URIs that start with a triple slash. PHP's `parse_uri()`
+  doesn't support them, so we now have a pure-php fallback in case it fails.
+* #9: Fix support for relative URI's that have a non-uri encoded colon `:` in
+  them.
+
+
+1.1.1 (2016-10-27)
+------------------
+
+* #10: Correctly support file:// URIs in the build() method. (@yuloh)
 
 
 1.1.0 (2016-03-07)

diff --git a/README.md b/README.md
@@ -25,14 +25,6 @@ Further reading
 * [Usage][8]
 
 
-Build status
-------------
-
-| branch | status |
-| ------ | ------ |
-| master | [![Build Status](https://travis-ci.org/fruux/sabre-uri.svg?branch=master)](https://travis-ci.org/fruux/sabre-uri) |
-
-
 Questions?
 ----------