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 #10138 from totten/master-hook-fix
[civicrm-core.git]
/
composer.json
diff --git
a/composer.json
b/composer.json
index 090ec1f1bc69842838e798ac23e240426186c6e8..7351739d882a5f4cb546b230f9a260a09f7fe2f3 100644
(file)
--- a/
composer.json
+++ b/
composer.json
@@
-18,10
+18,11
@@
"symfony/finder": "~2.5.0",
"tecnickcom/tcpdf" : "6.2.*",
"totten/ca-config": "~13.02",
"symfony/finder": "~2.5.0",
"tecnickcom/tcpdf" : "6.2.*",
"totten/ca-config": "~13.02",
- "civicrm/civicrm-cxn-rpc": "~0.15.12.04",
"zetacomponents/base": "1.7.*",
"zetacomponents/mail": "dev-1.7-civi",
"zetacomponents/base": "1.7.*",
"zetacomponents/mail": "dev-1.7-civi",
- "phpoffice/phpword": "^0.12.1"
+ "phpoffice/phpword": "^0.13.0",
+ "pear/Validate_Finance_CreditCard": "dev-master",
+ "civicrm/civicrm-cxn-rpc": "~0.16.12.05"
},
"repositories": [
{
},
"repositories": [
{
@@
-32,11
+33,13
@@
"scripts": {
"post-install-cmd": [
"bash tools/scripts/composer/dompdf-cleanup.sh",
"scripts": {
"post-install-cmd": [
"bash tools/scripts/composer/dompdf-cleanup.sh",
- "bash tools/scripts/composer/tcpdf-cleanup.sh"
+ "bash tools/scripts/composer/tcpdf-cleanup.sh",
+ "bash tools/scripts/composer/pear-execption-fix.sh"
],
"post-update-cmd": [
"bash tools/scripts/composer/dompdf-cleanup.sh",
],
"post-update-cmd": [
"bash tools/scripts/composer/dompdf-cleanup.sh",
- "bash tools/scripts/composer/tcpdf-cleanup.sh"
+ "bash tools/scripts/composer/tcpdf-cleanup.sh",
+ "bash tools/scripts/composer/pear-execption-fix.sh"
]
}
}
]
}
}