Merge branch 'release-4.2'

Author: jnga

gobotany/editor/templates/gobotany/edit_pile_taxon.html

@@ -10,7 +10,7 @@
 
 <p>
   ← return to pile <a href="..">{{ pile.slug }}</a><br>
-  → visit this plant in the <a href="/admin/core/taxon/{{ taxon.id }}"
+  → visit this plant in the <a href="/admin/core/taxon/{{ taxon.id }}/"
                                >admin interface</a>
 </p>
 

gobotany/plantshare/migrations/0009_alter_screenedimage_image.py

@@ -9,7 +9,15 @@
 
         <link rel="canonical" href="https://gobotany.nativeplanttrust.org{{ request.path }}">
 
-        <link rel="shortcut icon" href="/static/images/branding/favicon.png">
+        <link rel="apple-touch-icon" sizes="180x180"
+            href="/static/images/branding/gb-apple-touch-icon.png">
+        <link rel="icon" type="image/png" sizes="32x32"
+            href="/static/images/branding/gb-favicon-32x32.png">
+        <link rel="icon" type="image/png" sizes="16x16"
+            href="/static/images/branding/gb-favicon-16x16.png">
+        <link rel="mask-icon"
+            href="/static/images/branding/gb-safari-pinned-tab.svg"
+            color="#5bbad5">
 
         {# Unless this is the Production site, ask not to be indexed. #}
         {% if 'gobotany.nativeplanttrust.org' not in request.META.HTTP_HOST %}