Merge branch 'master' into vdom

This commit is contained in:
Sam
2016-02-12 18:21:03 +11:00
3 changed files with 4 additions and 4 deletions
@@ -167,7 +167,7 @@ const TopicView = Ember.View.extend(AddCategoryClass, AddArchetypeClass, Scrolli
suggestedTitle: function(){
return this.get('controller.model.isPrivateMessage') ?
I18n.t("suggested_topics.pm_title") :
"<i class='private-message-glyph fa fa-envelope'></i> " + I18n.t("suggested_topics.pm_title") :
I18n.t("suggested_topics.title");
}.property()
});