Merge branch 'master' into master
This commit is contained in:
commit
fef478781d
81 changed files with 979 additions and 400 deletions
|
@ -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?
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue