Merge branch 'security_core_24' into 'security-fixes'

Resolve civicrm#24 by upgrading PHPWord to 0.15 Closes civicrm#24 See merge request security/core!32
eileenmcnaughton · Jan 11, 2019 · 3bdbcc3 · 3bdbcc3
2 parents 461ddd7 + fba32ef
commit 3bdbcc3
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 24 deletions.
diff --git a/composer.json b/composer.json
@@ -49,7 +49,7 @@
     "zetacomponents/base": "1.7.*",
     "zetacomponents/mail": "dev-1.7-civi",
     "marcj/topsort": "~1.1",
-    "phpoffice/phpword": "^0.14.0",
+    "phpoffice/phpword": "^0.15.0",
     "pear/Validate_Finance_CreditCard": "dev-master",
     "civicrm/civicrm-cxn-rpc": "~0.17.07.01",
     "pear/Auth_SASL": "1.1.0",

diff --git a/composer.lock b/composer.lock