Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/beluga-core/core
Browse files Browse the repository at this point in the history
  • Loading branch information
root committed Oct 16, 2020
2 parents a9b37c3 + d1a1544 commit bc3c311
Show file tree
Hide file tree
Showing 90 changed files with 6,379 additions and 556 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 bc3c311

Please sign in to comment.