Merge branch 'major'

gatherdigital · Sep 26, 2019 · 0fe411d · 0fe411d
2 parents aeb1fed + c950d1d
commit 0fe411d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/ckeditor b/ckeditor
diff --git a/plugins/scayt b/plugins/scayt
diff --git a/presets/full-build-config.js b/presets/full-build-config.js
@@ -69,6 +69,7 @@ var CKBUILDER_CONFIG = {
 		maximize: 1,
 		newpage: 1,
 		pagebreak: 1,
+		pastefromgdocs: 1,
 		pastefromword: 1,
 		pastetext: 1,
 		preview: 1,

diff --git a/presets/standard-build-config.js b/presets/standard-build-config.js
@@ -52,6 +52,7 @@ var CKBUILDER_CONFIG = {
 		link: 1,
 		magicline: 1,
 		maximize: 1,
+		pastefromgdocs: 1,
 		pastefromword: 1,
 		pastetext: 1,
 		removeformat: 1,