Merge branch 'hotfix/1.2.1'

WarriorXK · Nov 29, 2016 · 7c33e1c · 7c33e1c
2 parents 30c459a + eaf4010
commit 7c33e1c
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -1,5 +1,6 @@
 # PHPWebSockets
-[![Build Status](https://travis-ci.org/WarriorXK/PHPWebSockets.svg?branch=develop)](https://travis-ci.org/WarriorXK/PHPWebSockets)
+Master: [![Build Status](https://travis-ci.org/WarriorXK/PHPWebSockets.svg?branch=master)](https://travis-ci.org/WarriorXK/PHPWebSockets) Develop: [![Build Status](https://travis-ci.org/WarriorXK/PHPWebSockets.svg?branch=develop)](https://travis-ci.org/WarriorXK/PHPWebSockets)
+
 A PHP 7.0+ library to accept and create websocket connections, we aim to be 100% compliant with the websocket RFC and use the [Autobahn test suite](http://autobahn.ws/testsuite/) to ensure so.
 Currently the server and the client are 100% compliant with the autobahn testsuite minus a few non-strict notices, the [compression extension](https://tools.ietf.org/html/rfc7692) for websockets will be implemented later
 

diff --git a/Tests/client.php b/Tests/client.php
diff --git a/Tests/server.php b/Tests/server.php
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.2.0
+1.2.1