Skip to content

Commit

Permalink
Merge pull request #26 from it-at-m/revert-17-mix-1498-1629
Browse files Browse the repository at this point in the history
Revert "Mix 1498 1629 into main"
  • Loading branch information
ThomasAFink authored Nov 29, 2023
2 parents a605b1f + d6f1393 commit d098455
Show file tree
Hide file tree
Showing 51 changed files with 754 additions and 1,786 deletions.
5 changes: 2 additions & 3 deletions zmsadmin/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@
"psr/http-message": "^1.0",
"container-interop/container-interop": "^1.2",
"twig/intl-extra": "^3.4",
"twig/twig": "3.*",
"symfony/polyfill-intl-icu": "^1.21"
"twig/twig": "3.*"
},
"bin": [],
"autoload": {
Expand All @@ -55,4 +54,4 @@
"BO\\Zmsadmin\\Tests\\": "tests/Zmsadmin/"
}
}
}
}
Loading

0 comments on commit d098455

Please sign in to comment.