Skip to content
Permalink
Browse files

Merge branch 't/10831' into major

  • Loading branch information...
oleq committed Sep 20, 2013
2 parents 898d132 + 3371fbf commit 68422482a00a382ff6bb944fe4bd7facafabbbc2
Showing with 201 additions and 288 deletions.
  1. +2 −0 CHANGES.md
  2. +1 −1 plugins/image2/dev/image2.html
  3. +197 −286 plugins/image2/plugin.js
  4. +1 −1 plugins/image2/samples/image2.html
@@ -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:
@@ -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', {
Oops, something went wrong.

0 comments on commit 6842248

Please sign in to comment.
You can’t perform that action at this time.