geckon01/php-qrcode
1
0
Fork 0
mirror of https://github.com/chillerlan/php-qrcode.git synced 2026-08-30 03:58:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into php-7.4

Browse Source 
# Conflicts:
#	tests/Output/QROutputTestAbstract.php
This commit is contained in:
codemasher
2019-12-04 19:02:13 +01:00
parent 3eaa702895 375a1dce5b
commit 2998b05cf6
7 changed files with 111 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composer.json
+2 -2
View File
@@ -28,10 +28,10 @@
"ext-gd": "*",
"ext-json": "*",
"ext-mbstring": "*",
"chillerlan/php-settings-container": "^1.1"
"chillerlan/php-settings-container": "^1.2"
},
"require-dev": {
"phpunit/phpunit": "^8.3"
"phpunit/phpunit": "^8.4"
},
"suggest": {
"chillerlan/php-authenticator": "Yet another Google authenticator! Also creates URIs for mobile apps."