Merge branch 'master' into courseware

2015-05-13 13:37:54 -07:00
parent 5569b26e18 f6697394b9
commit 48a9bcbb52
4 changed files with 6 additions and 6 deletions
--- a/views/account/show.jade
+++ b/views/account/show.jade
@@ -46,7 +46,7 @@ block content
                    .col-xs-12.col-sm-12.col-md-3.text-center
                        .background-svg.img-center
                            .points-on-top
-                                = "[ " + (user ? progressTimestamps.length : 0) + " ]"
+                                = "[ " + (progressTimestamps.length) + " ]"


            .row