Merge branch 'master' into develop

This commit is contained in:
Pierre Rudloff 2021-02-26 22:53:09 +01:00
commit 97d6532388
1 changed files with 13 additions and 8 deletions

21
composer.lock generated
View File

@ -1346,21 +1346,25 @@
}, },
{ {
"name": "smarty/smarty", "name": "smarty/smarty",
"version": "v3.1.33", "version": "v3.1.39",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/smarty-php/smarty.git", "url": "https://github.com/smarty-php/smarty.git",
"reference": "dd55b23121e55a3b4f1af90a707a6c4e5969530f" "reference": "e27da524f7bcd7361e3ea5cdfa99c4378a7b5419"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/smarty-php/smarty/zipball/dd55b23121e55a3b4f1af90a707a6c4e5969530f", "url": "https://api.github.com/repos/smarty-php/smarty/zipball/e27da524f7bcd7361e3ea5cdfa99c4378a7b5419",
"reference": "dd55b23121e55a3b4f1af90a707a6c4e5969530f", "reference": "e27da524f7bcd7361e3ea5cdfa99c4378a7b5419",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.2" "php": ">=5.2"
}, },
"require-dev": {
"phpunit/phpunit": "^7.5 || ^6.5 || ^5.7 || ^4.8",
"smarty/smarty-lexer": "^3.1"
},
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
@ -1368,8 +1372,8 @@
} }
}, },
"autoload": { "autoload": {
"files": [ "classmap": [
"libs/bootstrap.php" "libs/"
] ]
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
@ -1395,7 +1399,7 @@
"keywords": [ "keywords": [
"templating" "templating"
], ],
"time": "2018-09-12T20:54:16+00:00" "time": "2021-02-17T21:57:51+00:00"
}, },
{ {
"name": "symfony/console", "name": "symfony/console",
@ -7128,5 +7132,6 @@
"platform-dev": [], "platform-dev": [],
"platform-overrides": { "platform-overrides": {
"php": "7.3.11" "php": "7.3.11"
} },
"plugin-api-version": "1.1.0"
} }