Skip to content

Commit

Permalink
Merge pull request #82 from xprojects-de/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
xprojects-de authored Oct 17, 2024
2 parents 472f36b + ff447a3 commit cb3f7ad
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 8 deletions.
3 changes: 1 addition & 2 deletions .idea/alpdesk-core.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions .idea/php-test-framework.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions .idea/php.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 16 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,24 @@
"lcobucci/jwt": "^4.1",
"symfony/security-bundle": "^6.4",
"symfony/security-core": "^6.4",
"symfony/security-http": "^6.4",
"symfony/security-csrf": "^6.4",
"symfony/process": "^6.4",
"symfony/filesystem": "^6.4",
"doctrine/dbal": "^3.8"
"symfony/finder": "^6.4",
"symfony/http-foundation": "^6.4",
"symfony/password-hasher": "^6.4",
"symfony/config": "^6.4",
"symfony/http-client": "^6.4",
"symfony/routing": "^6.4",
"symfony/event-dispatcher": "^6.4",
"symfony/uid": "^6.4",
"symfony/yaml": "^6.4",
"symfony/string": "^6.4",
"symfony/framework-bundle": "^6.4",
"symfony/monolog-bridge": "^6.4",
"doctrine/dbal": "^3.8",
"monolog/monolog": "^2.9 || ^3.0"
},
"conflict": {
"contao/manager-plugin": "<2.0 || >=3.0"
Expand Down

0 comments on commit cb3f7ad

Please sign in to comment.