Skip to content
This repository has been archived by the owner on Jun 26, 2020. It is now read-only.

Commit

Permalink
Merge branch 'master' into t/72
Browse files Browse the repository at this point in the history
  • Loading branch information
Reinmar committed Sep 12, 2017
2 parents 4fbe076 + 5d20834 commit 2990734
Show file tree
Hide file tree
Showing 2 changed files with 364 additions and 276 deletions.
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"devDependencies": {
"@ckeditor/ckeditor5-dev-lint": "^3.1.0",
"@ckeditor/ckeditor5-basic-styles": "^0.9.0",
"@ckeditor/ckeditor5-clipboard": "*",
"@ckeditor/ckeditor5-editor-classic": "^0.8.0",
"@ckeditor/ckeditor5-enter": "^0.10.0",
"@ckeditor/ckeditor5-heading": "^0.10.0",
Expand Down
Loading

0 comments on commit 2990734

Please sign in to comment.