Skip to content

Commit

Permalink
Merge branch 'develop-5'
Browse files Browse the repository at this point in the history
  • Loading branch information
jschultze committed Sep 29, 2020
2 parents b11cd55 + bac1ca3 commit 71af972
Show file tree
Hide file tree
Showing 74 changed files with 5,335 additions and 493 deletions.
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@
"zendframework/zendservice-amazon": "2.3.0",
"zendframework/zendservice-recaptcha": "3.1.0",
"zf-commons/zfc-rbac": "2.6.3",
"picqer/php-barcode-generator": "^0.3.0"
"picqer/php-barcode-generator": "^0.3.0",
"sabberworm/php-css-parser": "*"
},
"require-dev": {
"behat/mink": "1.7.1",
Expand Down
Loading

0 comments on commit 71af972

Please sign in to comment.