From 5549c92849b708f85245127ff9cfbb86d73c3702 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 2 Dec 2019 17:00:09 +0100 Subject: 5.0rc1 --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index dc1edc4..6ef2747 100644 --- a/composer.json +++ b/composer.json @@ -63,6 +63,7 @@ "conflict": { "phpseclib/phpseclib": "2.0.8", "tecnickcom/tcpdf": "<6.2", + "pragmarx/google2fa": ">=6.1", "pragmarx/google2fa-qrcode": "<1.0.1", "samyoul/u2f-php-server": "<1.1" }, @@ -88,7 +89,7 @@ "pragmarx/google2fa-qrcode": "^1.0.1", "samyoul/u2f-php-server": "^1.1", "squizlabs/php_codesniffer": "^3.0", - "tecnickcom/tcpdf": "^6.2" + "tecnickcom/tcpdf": "^6.3" }, "extra": { "branch-alias": { -- cgit