Digitalstack/myaac
2
0
Fork 0
mirror of https://github.com/slawkens/myaac.git synced 2025-10-22 05:15:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/new-router

Browse Source 
# Conflicts:
#	composer.json
#	system/login.php
This commit is contained in:
slawkens
2023-02-03 07:31:39 +01:00
parent 07887423c6 a2fb9a183b
commit 11768424a3
199 changed files with 4166 additions and 1379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@@ -8,7 +8,7 @@
"ext-dom": "*",
"phpmailer/phpmailer": "^6.1",
"composer/semver": "^3.2",
"twig/twig": "^1.0",
"twig/twig": "^2.0",
"erusev/parsedown": "^1.7",
"nikic/fast-route": "^1.3"
}