Merge branch 'master' of https://github.com/alphagov/notifications-admin into make-content-links-in-notify-consistent

This commit is contained in:
chrisw
2018-01-05 14:50:05 +00:00
70 changed files with 1792 additions and 1226 deletions

View File

@@ -19,7 +19,7 @@
<p><a href="https://www.gov.uk/service-manual/design/sending-emails-and-text-messages">Check the Service Manual</a> for guidance on how to:</p>
<ul class="list list-bullet">
<li>plan and write text messages and emails</li>
<li><a href="https://www.gov.uk/service-manual/technology/how-to-email-your-users">send emails</a> in a way that protects users from spam and phishing</li>
<li>send emails in a way that protects users from spam and phishing</li>
</ul>
<h2 id="trial-mode" class="heading-medium">Trial mode</h2>