Merge branch 'dev' into user_dashboard

2011-11-02 20:59:06 +02:00 · 2011-11-02 20:59:06 +02:00 · 83c1194d52
commit 83c1194d52
parent a6fa80529a 5fb1b9ffe3
15 changed files with 67 additions and 20 deletions
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@ -28,6 +28,8 @@ module ApplicationHelper
    else
      "Never"
    end
+  rescue 
+    "Never"
  end

  def markdown(text)