Merge branch 'v3' of https://github.com/craftcms/cms into develop

# Conflicts:
#	CHANGELOG.md
#	src/translations/en/app.php

[ci skip]

Author: brandonkelly

src/templates/_components/utilities/Migrations.twig

@@ -1,14 +1,16 @@
 {% import "_includes/forms" as forms %}
 
+{% if not newMigrations %}
+    <p class="zilch">{{ 'No pending content migrations.'|t('app') }}</p>
+{% endif %}
+
 {% if newMigrations or migrationHistory %}
     {% if newMigrations %}
         <form method="post" accept-charset="UTF-8" action="" class="buttons">
             {{ csrfInput() }}
             {{ actionInput('utilities/apply-new-migrations') }}
             <button type="submit" class="btn submit">{{ 'Apply new migrations'|t('app') }}</button>
         </form>
-    {% else %}
-        <p>{{ 'No pending content migrations.'|t('app') }}</p>
     {% endif %}
 
     <table class="data fullwidth">
@@ -38,6 +40,4 @@
             {% endfor %}
         </tbody>
     </table>
-{% else %}
-    <p>{{ 'No content migrations.'|t('app') }}</p>
 {% endif %}

src/translations/en/app.php

@@ -953,7 +953,6 @@
     'No GraphQL tokens exist yet.' => 'No GraphQL tokens exist yet.',
     'No blocks.' => 'No blocks.',
     'No category groups exist yet.' => 'No category groups exist yet.',
-    'No content migrations.' => 'No content migrations.',
     'No deprecation warnings to report!' => 'No deprecation warnings to report!',
     'No entries exist yet.' => 'No entries exist yet.',
     'No entry types exist for this section.' => 'No entry types exist for this section.',