Merge remote-tracking branch 'origin/websocket-client' into websocket…

…-client
basst314 · Feb 19, 2017 · f5c8b15 · f5c8b15
2 parents 50ad350 + 3f7e68a
commit f5c8b15
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# space [![Build Status](https://travis-ci.org/basst314/space.svg?branch=master)](https://travis-ci.org/basst314/space) [![volkswagen status](https://auchenberg.github.io/volkswagen/volkswargen_ci.svg?v=1)](https://github.com/auchenberg/volkswagen) [![Coverage Status](https://coveralls.io/repos/github/basst314/space/badge.svg?branch=space_api)](https://coveralls.io/github/basst314/space?branch=master)
+# space [![Build Status](https://travis-ci.org/basst314/space.svg?branch=master)](https://travis-ci.org/basst314/space) [![volkswagen status](https://auchenberg.github.io/volkswagen/volkswargen_ci.svg?v=1)](https://github.com/auchenberg/volkswagen) [![Coverage Status](https://coveralls.io/repos/github/basst314/space/badge.svg?branch=master)](https://coveralls.io/github/basst314/space?branch=master)
 
 Welcome to space. A one-dimensional space-adventure game.