OilfieldToolsNet/shlink
4
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge conflicts

Browse Source
This commit is contained in:
Alejandro Celaya
2020-04-30 20:26:00 +02:00
parent 704958994d a30f796100
commit 4498386f56
7 changed files with 40 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docker/config/shlink_in_docker.local.php
View File

@@ -160,6 +160,10 @@ return [
],
],
'geolite2' => [
'license_key' => env('GEOLITE_LICENSE_KEY', 'G4Lm0C60yJsnkdPi'),
],
'mercure' => $helper->getMercureConfig(),
];