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 #16302 from colemanw/wildcards
[civicrm-core.git]
/
composer.json
diff --git
a/composer.json
b/composer.json
index ba9ddd22f10fcc59ca36495d102f918f067fe55e..ff3e3da5d4302a2b033f7d4f2b019ae3578d2e1f 100644
(file)
--- a/
composer.json
+++ b/
composer.json
@@
-48,7
+48,7
@@
"tecnickcom/tcpdf" : "6.2.*",
"totten/ca-config": "~17.05",
"zetacomponents/base": "1.9.*",
"tecnickcom/tcpdf" : "6.2.*",
"totten/ca-config": "~17.05",
"zetacomponents/base": "1.9.*",
- "zetacomponents/mail": "
dev-master
",
+ "zetacomponents/mail": "
1.9.*
",
"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",
@@
-154,7
+154,7
@@
"ignore": [".*", "node_modules", "docs", "Gruntfile.js", "index.html", "package.json", "test"]
},
"ckeditor": {
"ignore": [".*", "node_modules", "docs", "Gruntfile.js", "index.html", "package.json", "test"]
},
"ckeditor": {
- "url": "https://github.com/ckeditor/ckeditor-releases/archive/4.
9.2
.zip"
+ "url": "https://github.com/ckeditor/ckeditor-releases/archive/4.
13.0
.zip"
},
"crossfilter-1.3.x": {
"url": "https://github.com/crossfilter/crossfilter/archive/1.3.14.zip",
},
"crossfilter-1.3.x": {
"url": "https://github.com/crossfilter/crossfilter/archive/1.3.14.zip",