Merge branch 'release/messaging2'

2016-12-20 10:14:08 +01:00
parent 5603db67b3 b18abc0357
commit 2a56e86988
2 changed files with 3 additions and 2 deletions
@@ -90,7 +90,7 @@
  </div>
  <div class="grid_4" id="about">
    <h3>About</h3>
-    <p>This site is a beta site, pioneering rowing data visualization and analysis. No warrantied. It's author is 
+    <p>This site is a beta site, pioneering rowing data visualization and analysis. No warranties. The site's author is 
      Sander Roosendaal. A Masters rower.
      
      Read his <a href="http://blog.rowsandall.com/">blog</a>
@@ -1992,7 +1992,8 @@ def workouts_view(request,message='',successmessage='',
        announcements = SiteAnnouncement.objects.filter(
            expires__gte=today
        ).order_by(
-            "-created"
+            "-created",
+            "-id"
        )
            
 	return render(request, 'list_workouts.html',