Commit 3a481599 authored by Jonne Haß's avatar Jonne Haß

Merge branch 'stable' into develop

parents 00fc14e2 48f5aed6
......@@ -83,7 +83,7 @@ class Conversation < ActiveRecord::Base
def subject
self[:subject].blank? ? "no subject" : self[:subject]
self[:subject].blank? ? I18n.t("") : self[:subject]
def subscribers(user)
......@@ -350,6 +350,7 @@ en:
to: "To"
subject: "Subject"
subject_default: "No subject"
send: "Send"
sending: "Sending..."
abandon_changes: "Abandon changes?"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment