Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Bert Oost committed Jul 15, 2018
2 parents 86c4cc3 + e525f78 commit d279c08
Show file tree
Hide file tree
Showing 174 changed files with 12,198 additions and 11,383 deletions.
2 changes: 1 addition & 1 deletion FroalaEditorPlugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public function getName()
*/
public function getEditorVersion()
{
return '2.8.3';
return '2.8.4';
}

/**
Expand Down
8 changes: 8 additions & 0 deletions releases.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
[
{
"version": "2.8.4",
"downloadUrl": "https://github.com/froala/Craft-Froala-WYSIWYG/archive/v2.8.4.zip",
"date": "2018-07-15T22:00:00+02:00",
"notes": [
"[Improved] Updated editor to version 2.8.4 along with the plugin version."
]
},
{
"version": "2.8.3",
"downloadUrl": "https://github.com/froala/Craft-Froala-WYSIWYG/archive/v2.8.3.zip",
Expand Down
7 changes: 0 additions & 7 deletions resources/lib/v2.8.3/js/froala_editor.min.js

This file was deleted.

7 changes: 0 additions & 7 deletions resources/lib/v2.8.3/js/froala_editor.pkgd.min.js

This file was deleted.

302 changes: 0 additions & 302 deletions resources/lib/v2.8.3/js/languages/ar.js

This file was deleted.

302 changes: 0 additions & 302 deletions resources/lib/v2.8.3/js/languages/bs.js

This file was deleted.

Loading

0 comments on commit d279c08

Please sign in to comment.