Merge branch 'master' of github.com:DesignSafe-CI/portal

DesignSafe-CI · Mar 8, 2016 · 067de67 · 067de67
2 parents 8cb86a2 + caec4cf
commit 067de67
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/designsafe/apps/accounts/templates/designsafe/apps/accounts/notifications.html b/designsafe/apps/accounts/templates/designsafe/apps/accounts/notifications.html
@@ -59,7 +59,7 @@ <h2>No unread notifications.</h2>
       <p>
         You have no unread notifications.
         <a href="{% url 'designsafe_accounts:manage_notifications' %}">Click here</a>
-        to manage you notification settings.
+        to manage your notification settings.
       </p>
     </div>
   {% endif %}

diff --git a/...nsafe/apps/notifications/static/designsafe/apps/notifications/html/notification_list.html b/...nsafe/apps/notifications/static/designsafe/apps/notifications/html/notification_list.html
@@ -57,6 +57,6 @@ <h2>No unread notifications.</h2>
   <p>
     You have no unread notifications.
     <a href="{% url 'designsafe_accounts:manage_notifications' %}">Click here</a>
-    to manage you notification settings.
+    to manage your notification settings.
   </p>
 </div>