Merge branch 'master' into master

2017-04-07 22:21:21 -04:00
parent bf7cefa516 c1a553d2c2
commit fef478781d
81 changed files with 979 additions and 400 deletions
--- a/app/helpers/stream_entries_helper.rb
+++ b/app/helpers/stream_entries_helper.rb
@@ -34,10 +34,6 @@ module StreamEntriesHelper
    user_signed_in? && @favourited.key?(status.id) ? 'favourited' : ''
  end

-  def proper_status(status)
-    status.reblog? ? status.reblog : status
-  end
-
  def rtl?(text)
    return false if text.empty?