Merge branch 'master' into order-delivery-flow

2018-11-04 11:17:42 +01:00
parent 8d4f75cc41 388f7df8a8
commit e8a3668c25
23 changed files with 1745 additions and 459 deletions
--- a/backend/composer.json
+++ b/backend/composer.json
@@ -49,6 +49,7 @@
    "johnpbloch/wordpress": "4.9.7",
    "oscarotero/env": "1.1.0",
    "roots/wp-password-bcrypt": "1.0.0",
+    "phpoffice/phpspreadsheet": "1.5",

    "woocommerce/woocommerce": "3.5.0",
    "3rdparty/woocommerce-product-bundles": "*",