Merge branch 'release/1.0.1'

Tom Densham · Tom Densham · commit cb686ab7d059 · 2014-02-18T15:38:11.000Z
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# ShortCodes Videos Module
+# ShortCodes Module
 
 ## Overview
 
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "studiobonito/silverstripe-shortcodes",
-    "description": "Shortcodes Module is based on Daniel Hensby's post at SSbits. It adds a shortcode for inserting YouTube videos to pages, as well as adding a button to the TinyMCE WYSIWYG editor.",
+    "description": "ShortCodes Module is based on Daniel Hensby's post at SSbits. It adds a shortcode for inserting YouTube and Vimeo videos to pages, as well as adding a buttons to the TinyMCE WYSIWYG editor.",
     "type": "silverstripe-module",
     "keywords": ["silverstripe", "shortcodes", "vimeo", "youtube", "video", "shortcode", "wysiwyg", "tinymce", "cms"],
     "license": "BSD-2-Clause",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "studiobonito/silverstripe-shortcodes",`
`3`		`- "description": "Shortcodes Module is based on Daniel Hensby's post at SSbits. It adds a shortcode for inserting YouTube videos to pages, as well as adding a button to the TinyMCE WYSIWYG editor.",`
	`3`	`+ "description": "ShortCodes Module is based on Daniel Hensby's post at SSbits. It adds a shortcode for inserting YouTube and Vimeo videos to pages, as well as adding a buttons to the TinyMCE WYSIWYG editor.",`
`4`	`4`	`"type": "silverstripe-module",`
`5`	`5`	`"keywords": ["silverstripe", "shortcodes", "vimeo", "youtube", "video", "shortcode", "wysiwyg", "tinymce", "cms"],`
`6`	`6`	`"license": "BSD-2-Clause",`