Merge branch 'pr336' into major

ckeditor · Apr 6, 2017 · e88dbdd · e88dbdd
2 parents c896eaa + 684825c
commit e88dbdd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -37,6 +37,7 @@ Fixed Issues:
 * [#14407](https://dev.ckeditor.com/ticket/14407): [IE] Fixed: Non-editable widgets can be edited.
 * [#16845](https://dev.ckeditor.com/ticket/16845): [IE] Fixed: Cursor jumps to the top of the scrolled editor after focusing it when [Copy Formatting](http://ckeditor.com/addon/copyformatting) plugin is enabled.
 * [#16927](https://dev.ckeditor.com/ticket/16927): Fixed: CKEditor throws an error if a bundle containing [Color Button](http://ckeditor.com/addon/colorbutton) plugin is run in ES5 strict mode. Thanks to [Igor Rubinovich](https://github.com/IgorRubinovich)!
+* [PR#336](https://github.com/ckeditor/ckeditor-dev/pull/336): Fixed: Typo in [CKEDITOR.getCss](http://docs.ckeditor.com/#!/api/CKEDITOR-method-getCss) api docs. Thanks to [knusperpixel](https://github.com/knusperpixel)!
 
 Other Changes:
 

diff --git a/core/ckeditor.js b/core/ckeditor.js
@@ -126,7 +126,7 @@ CKEDITOR.remove = function( editor ) {
 	};
 
 	/**
-	 * Returns a string will all CSS rules passed to the {@link CKEDITOR#addCss} method.
+	 * Returns a string with all CSS rules passed to the {@link CKEDITOR#addCss} method.
 	 *
 	 * @returns {String} A string containing CSS rules.
 	 */