Chris Boden 40f267834a Merge branch 'refs/heads/master' (v0.2.7) into 0.3 ... Conflicts: CHANGELOG.md composer.json composer.lock src/Ratchet/ConnectionInterface.php src/Ratchet/WebSocket/Version/HyBi10.php src/Ratchet/WebSocket/Version/RFC6455.php src/Ratchet/WebSocket/WsServer.php		2013-06-09 12:04:42 -04:00
..
Encoding	OCD API documentation updates	2013-01-05 16:10:21 -05:00
Version	Merge branch 'refs/heads/master' (v0.2.7) into 0.3	2013-06-09 12:04:42 -04:00
VersionManager.php	OCD API documentation updates	2013-01-05 16:10:21 -05:00
WsServer.php	Merge branch 'refs/heads/master' (v0.2.7) into 0.3	2013-06-09 12:04:42 -04:00
WsServerInterface.php	API documentation	2012-07-22 11:25:55 -04:00