Skip to content

Commit

Permalink
Merge pull request #10590 from seamuslee001/CRM-20561-46-unified
Browse files Browse the repository at this point in the history
CRM-18408 CRM-20561
  • Loading branch information
jackrabbithanna authored Jul 5, 2017
2 parents b247fb4 + 5fbf08d commit bef38bc
Show file tree
Hide file tree
Showing 2 changed files with 94 additions and 40 deletions.
7 changes: 4 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@
"psr/log": "1.0.0",
"symfony/finder": "2.3.*",
"tecnickcom/tcpdf" : "6.2.*",
"totten/ca-config": "~13.02",
"civicrm/civicrm-cxn-rpc": "~0.15.12.04",
"pear/Net_SMTP": "1.6.*",
"pear/Net_socket": "1.0.*"
"pear/Net_socket": "1.0.*",
"totten/ca-config": "~17.05",
"civicrm/civicrm-cxn-rpc": "~0.16.12.05",
"pear/Auth_SASL": "1.1.0"
},
"scripts": {
"post-install-cmd": [
Expand Down
127 changes: 90 additions & 37 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit bef38bc

Please sign in to comment.