kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-04-29 09:39:57 +00:00
Code Issues Projects Releases Wiki Activity

Fixed composer.lock merge conflict (references #1273)

Browse Source
This commit is contained in:
Bernd Bestel 2021-06-18 20:58:51 +02:00
parent 5ad4d9f421
commit c45034e6b1
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
1 changed files with 108 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "b8b8e77618038c44c21edac2c31c4b67",
"content-hash": "9c4580f416241994ddaffb569998b7f8",
"packages": [
{
"name": "doctrine/inflector",
@ -1113,6 +1113,112 @@
},
"time": "2017-06-05T04:41:51+00:00"
},
{
"name": "mike42/escpos-php",
"version": "v3.0",
"source": {
"type": "git",
"url": "https://github.com/mike42/escpos-php.git",
"reference": "dcb569a123d75f9f6a4a927aae7625ca6b7fdcf3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/mike42/escpos-php/zipball/dcb569a123d75f9f6a4a927aae7625ca6b7fdcf3",
"reference": "dcb569a123d75f9f6a4a927aae7625ca6b7fdcf3",
"shasum": ""
},
"require": {
"ext-intl": "*",
"ext-json": "*",
"ext-zlib": "*",
"mike42/gfx-php": "^0.6",
"php": ">=7.0.0"
},
"require-dev": {
"phpunit/phpunit": "^6.5",
"squizlabs/php_codesniffer": "^3.3"
},
"suggest": {
"ext-gd": "Used for image printing if present.",
"ext-imagick": "Will be used for image printing if present. Required for PDF printing or use of custom fonts."
},
"type": "library",
"autoload": {
"psr-4": {
"Mike42\\": "src/Mike42"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Michael Billington",
"email": "michael.billington@gmail.com"
}
],
"description": "PHP receipt printer library for use with ESC/POS-compatible thermal and impact printers",
"homepage": "https://github.com/mike42/escpos-php",
"keywords": [
"Epson",
"barcode",
"escpos",
"printer",
"receipt-printer"
],
"support": {
"issues": "https://github.com/mike42/escpos-php/issues",
"source": "https://github.com/mike42/escpos-php/tree/v3.0"
},
"time": "2019-10-13T06:27:43+00:00"
},
{
"name": "mike42/gfx-php",
"version": "v0.6",
"source": {
"type": "git",
"url": "https://github.com/mike42/gfx-php.git",
"reference": "ed9ded2a9298e4084a9c557ab74a89b71e43dbdb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/mike42/gfx-php/zipball/ed9ded2a9298e4084a9c557ab74a89b71e43dbdb",
"reference": "ed9ded2a9298e4084a9c557ab74a89b71e43dbdb",
"shasum": ""
},
"require": {
"php": ">=7.0.0"
},
"require-dev": {
"phpbench/phpbench": "@dev",
"phpunit/phpunit": "^6.5",
"squizlabs/php_codesniffer": "^3.3.1"
},
"type": "library",
"autoload": {
"psr-4": {
"Mike42\\": "src/Mike42"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"LGPL-2.1-or-later"
],
"authors": [
{
"name": "Michael Billington",
"email": "michael.billington@gmail.com"
}
],
"description": "The pure PHP graphics library",
"homepage": "https://github.com/mike42/gfx-php",
"support": {
"issues": "https://github.com/mike42/gfx-php/issues",
"source": "https://github.com/mike42/gfx-php/tree/v0.6"
},
"time": "2019-10-05T02:44:33+00:00"
},
{
"name": "morris/lessql",
"version": "v0.4.1",
@ -2865,5 +2971,5 @@
"php": ">=7.4"
},
"platform-dev": [],
"plugin-api-version": "2.1.0"
"plugin-api-version": "2.0.0"
}