Jelajahi Sumber

Merge branch 'master' into t/ckeditor5-ui/348

Aleksander Nowodzinski 8 tahun lalu
induk
melakukan
14976eba9c

+ 1 - 1
docs/framework/guides/contributing/git-commit-message-convention.md

@@ -140,7 +140,7 @@ As a reviewer, remember that the message will end up in the changelog and must b
 
 
 When closing a PR remember to copy the source of the message to the textarea with the merge commit message:
 When closing a PR remember to copy the source of the message to the textarea with the merge commit message:
 
 
-{@img assets/img/closing-a-pr.png Screencast how to copy a source version of the suggested commit message when closing a PR.}
+{@img assets/img/closing-a-pr.gif Screencast how to copy a source version of the suggested commit message when closing a PR.}
 
 
 ### Giving credit
 ### Giving credit
 
 

+ 2 - 0
mgit.json

@@ -20,7 +20,9 @@
     "@ckeditor/ckeditor5-engine": "ckeditor/ckeditor5-engine",
     "@ckeditor/ckeditor5-engine": "ckeditor/ckeditor5-engine",
     "@ckeditor/ckeditor5-enter": "ckeditor/ckeditor5-enter",
     "@ckeditor/ckeditor5-enter": "ckeditor/ckeditor5-enter",
     "@ckeditor/ckeditor5-essentials": "ckeditor/ckeditor5-essentials",
     "@ckeditor/ckeditor5-essentials": "ckeditor/ckeditor5-essentials",
+    "@ckeditor/ckeditor5-font": "ckeditor/ckeditor5-font",
     "@ckeditor/ckeditor5-heading": "ckeditor/ckeditor5-heading",
     "@ckeditor/ckeditor5-heading": "ckeditor/ckeditor5-heading",
+    "@ckeditor/ckeditor5-highlight": "ckeditor/ckeditor5-highlight",
     "@ckeditor/ckeditor5-image": "ckeditor/ckeditor5-image",
     "@ckeditor/ckeditor5-image": "ckeditor/ckeditor5-image",
     "@ckeditor/ckeditor5-link": "ckeditor/ckeditor5-link",
     "@ckeditor/ckeditor5-link": "ckeditor/ckeditor5-link",
     "@ckeditor/ckeditor5-list": "ckeditor/ckeditor5-list",
     "@ckeditor/ckeditor5-list": "ckeditor/ckeditor5-list",

+ 2 - 0
package.json

@@ -31,7 +31,9 @@
     "@ckeditor/ckeditor5-engine": "^1.0.0-alpha.2",
     "@ckeditor/ckeditor5-engine": "^1.0.0-alpha.2",
     "@ckeditor/ckeditor5-enter": "^1.0.0-alpha.2",
     "@ckeditor/ckeditor5-enter": "^1.0.0-alpha.2",
     "@ckeditor/ckeditor5-essentials": "^1.0.0-alpha.2",
     "@ckeditor/ckeditor5-essentials": "^1.0.0-alpha.2",
+    "@ckeditor/ckeditor5-font": "^0.0.1",
     "@ckeditor/ckeditor5-heading": "^1.0.0-alpha.2",
     "@ckeditor/ckeditor5-heading": "^1.0.0-alpha.2",
+    "@ckeditor/ckeditor5-highlight": "^0.0.1",
     "@ckeditor/ckeditor5-image": "^1.0.0-alpha.2",
     "@ckeditor/ckeditor5-image": "^1.0.0-alpha.2",
     "@ckeditor/ckeditor5-link": "^1.0.0-alpha.2",
     "@ckeditor/ckeditor5-link": "^1.0.0-alpha.2",
     "@ckeditor/ckeditor5-list": "^1.0.0-alpha.2",
     "@ckeditor/ckeditor5-list": "^1.0.0-alpha.2",