diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7236a17ce..1593ea648 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ jobs: build: name: Python ${{ matrix.python-version }}, Django ${{ matrix.django-version }} (${{ matrix.variant }}) - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 continue-on-error: ${{ matrix.experimental == 'true' }} strategy: matrix: @@ -97,4 +97,4 @@ jobs: uses: pypa/gh-action-pypi-publish@v1.4.1 with: user: __token__ - password: ${{ secrets.PYPI_TOKEN }} \ No newline at end of file + password: ${{ secrets.PYPI_TOKEN }} diff --git a/two_factor/templates/two_factor/admin/setup.html b/two_factor/templates/two_factor/admin/setup.html index ba83cf31c..3901dc937 100644 --- a/two_factor/templates/two_factor/admin/setup.html +++ b/two_factor/templates/two_factor/admin/setup.html @@ -20,7 +20,7 @@ smartphone to scan the QR code below. For example, use Google Authenticator. Then, enter the token generated by the app. {% endblocktrans %}

-

QR Code

+

QR Code

{% elif wizard.steps.current == 'sms' %}

{% blocktrans trimmed %}Please enter the phone number you wish to receive the text messages on. This number will be validated in the next step.