Merge branch 't/10831' into major

ckeditor · Sep 20, 2013 · 6842248 · 6842248
2 parents 898d132 + 3371fbf
commit 6842248
Show file tree

Hide file tree

Showing 4 changed files with 201 additions and 288 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -5,6 +5,8 @@ CKEditor 4 Changelog
 
 Fixed Issues:
 
+* [#10831](http://dev.ckeditor.com/ticket/10831): Image2: Merged `image2inline` and `image2block` into `image2` widget.
+
 ## CKEditor 4.3 Beta
 
 New Features:

diff --git a/plugins/image2/dev/image2.html b/plugins/image2/dev/image2.html
@@ -170,7 +170,7 @@ <h2>Technical details <a id="tech-details" name="tech-details"></a></h2>
 			extraPlugins: 'image2',
 			height: 600,
 			removePlugins: 'image,forms',
-			contentsCss: [ '../../../contents.css', 'contents.css' ],
+			contentsCss: [ '../../../contents.css', 'contents.css' ]
 		} );
 
 		CKEDITOR.inline( 'editor2', {