projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #19324 from demeritcowboy/no-port
[civicrm-core.git]
/
composer.json
diff --git
a/composer.json
b/composer.json
index 57cc5e2d5309c0624aab6f5059e2a95c7f5c838c..119c1bc7fe925acd9d522b005b2d9436ca0431b8 100644
(file)
--- a/
composer.json
+++ b/
composer.json
@@
-62,7
+62,7
@@
"marcj/topsort": "~1.1",
"phpoffice/phpword": "^0.15.0",
"pear/validate_finance_creditcard": "dev-master",
"marcj/topsort": "~1.1",
"phpoffice/phpword": "^0.15.0",
"pear/validate_finance_creditcard": "dev-master",
- "civicrm/civicrm-cxn-rpc": "~0.
19.01.08
",
+ "civicrm/civicrm-cxn-rpc": "~0.
20.12.01 || ~0.19.01.10
",
"pear/auth_sasl": "1.1.0",
"pear/net_smtp": "1.9.*",
"pear/net_socket": "1.0.*",
"pear/auth_sasl": "1.1.0",
"pear/net_smtp": "1.9.*",
"pear/net_socket": "1.0.*",
@@
-215,7
+215,7
@@
},
"monaco-editor": {
"url": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.16.2.tgz",
},
"monaco-editor": {
"url": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.16.2.tgz",
- "path": "
ext/afform/html/
bower_components/monaco-editor"
+ "path": "bower_components/monaco-editor"
},
"google-code-prettify": {
"url": "https://github.com/tcollard/google-code-prettify/archive/v1.0.5.zip",
},
"google-code-prettify": {
"url": "https://github.com/tcollard/google-code-prettify/archive/v1.0.5.zip",