Merge branch 'v5'

# Conflicts:
#	.github/workflows/tests.yml
#	.travis.yml
#	README.md
#	composer.json
#	examples/imageWithLogo.php
#	examples/svg.php
#	src/QRCode.php
This commit is contained in:
codemasher
2021-11-18 12:00:10 +01:00
110 changed files with 7866 additions and 1776 deletions
+6 -4
View File
@@ -22,7 +22,9 @@ jobs:
uses: ./.github/actions/build-docs
- name: "Publish Docs to gh-pages"
uses: maxheld83/ghpages@v0.3.0
env:
BUILD_DIR: docs/
GH_PAT: ${{ secrets.GH_PAT }}
uses: JamesIves/github-pages-deploy-action@4.1
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BRANCH: gh-pages
FOLDER: dist
CLEAN: true