Mirrors/shlink
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2026-03-06 23:33:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge conflicts

Browse Source
This commit is contained in:
Alejandro Celaya
2022-02-19 19:47:34 +01:00
parent 79af315b9f e1ebbaa52f
commit c52f3c396b
10 changed files with 100 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@@ -51,7 +51,7 @@
"shlinkio/shlink-config": "^1.6",
"shlinkio/shlink-event-dispatcher": "^2.3",
"shlinkio/shlink-importer": "^2.5",
"shlinkio/shlink-installer": "dev-develop#68f5de1 as 7.1",
"shlinkio/shlink-installer": "dev-develop#ea5e967 as 7.1",
"shlinkio/shlink-ip-geolocation": "^2.2",
"symfony/console": "^6.0",
"symfony/filesystem": "^6.0",