Merge branch 'master' into i18n

This commit is contained in:
GenZmeY 2022-03-30 00:31:01 +03:00 committed by GitHub
commit e02cd1edbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -15,6 +15,7 @@ jobs:
run: | run: |
git config --local user.email "github-actions[bot]@users.noreply.github.com" git config --local user.email "github-actions[bot]@users.noreply.github.com"
git config --local user.name "github-actions" git config --local user.name "github-actions"
git config --local pull.rebase false
- name: Add upstream repo - name: Add upstream repo
run: git remote add upstream https://github.com/TryGhost/Casper.git run: git remote add upstream https://github.com/TryGhost/Casper.git
- name: Checkout master - name: Checkout master