Merge branch '3.1'

Conflicts: README.md
gordonbanderson · Dec 17, 2015 · d7dd7ee · d7dd7ee
2 parents 9fc5c32 + 50ef47c
commit d7dd7ee
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -1,18 +1,23 @@
 #YouTube ShortCode Handler
-This module allows YouTube videos to be entered as short codes.  It is based on the SSBits tutorial http://www.ssbits.com/tutorials/2010/2-4-using-short-codes-to-embed-a-youtube-video/ and adpated to work with Silverstripe 3.
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/gordonbanderson/weboftalent-youtube/badges/quality-score.png?b=3.1)](https://scrutinizer-ci.com/g/gordonbanderson/weboftalent-youtube/?branch=3.1)
+[![Code Coverage](https://scrutinizer-ci.com/g/gordonbanderson/weboftalent-youtube/badges/coverage.png?b=3.1)](https://scrutinizer-ci.com/g/gordonbanderson/weboftalent-youtube/?branch=3.1)
+[![Build Status](https://scrutinizer-ci.com/g/gordonbanderson/weboftalent-youtube/badges/build.png?b=3.1)](https://scrutinizer-ci.com/g/gordonbanderson/weboftalent-youtube/build-status/3.1)
+
+This module allows YouTube videos to be entered as short codes.  It is based on
+the SSBits tutorial
+http://www.ssbits.com/tutorials/2010/2-4-using-short-codes-to-embed-a-youtube-video/
+and adpated to work with Silverstripe 3.
 
 ##Functionality
 Videos can be entered into a page using the YouTube code (the v parameter in a YouTube URL).
 ```
 [YouTube id='_yY3Gu8HbzE']
 ```
 The following parameters are also permitted:
-* _autoplay_ - set this value to anything, e.g. 1 or true, to enable autoplay on the embedded video
-- _caption_ - Text to display after an embedded video.  This can either be passed as an attribute or as follows ```[YouTube id='_yY3Gu8HbzE']This is the caption[/YouTube]```
+* _autoplay_ - set this value to anything, e.g. 1 or true, to enable autoplay on
+the embedded video
+- _caption_ - Text to display after an embedded video.  This can either be
+passed as an attribute or as follows ```[YouTube id='_yY3Gu8HbzE']This is the
+caption[/YouTube]```
 - _height_ - set the height of the video
 - _width_ - set the width of the video
-
-
-## Build Info
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/gordonbanderson/weboftalent-youtube/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/gordonbanderson/weboftalent-youtube/?branch=master)
-[![Build Status](https://scrutinizer-ci.com/g/gordonbanderson/weboftalent-youtube/badges/build.png?b=master)](https://scrutinizer-ci.com/g/gordonbanderson/weboftalent-youtube/build-status/master)