manual merge

2021-03-01 14:50:45 +02:00
parent b8f3f53d56 dd8e55c2ac
commit 70fa577e10
2 changed files with 11 additions and 827 deletions
@@ -27,8 +27,8 @@
        "yzalis/identicon": "*",
        "zordius/lightncandy": "dev-espo#v1.2.5e",
        "composer/semver": "^3",
-        "tecnickcom/tcpdf": "dev-main#456b794f1fae9aee5c151a1ee515aae2aaa619a3 as 6.3.6",
        "spatie/async": "1.5.3",
+        "tecnickcom/tcpdf": "6.3.5",
        "symfony/process": "4.1.7",
        "symfony/http-foundation": "4.4.7",
        "cboden/ratchet": "^0.4.1",