1d1c3a808a
Conflicts: - `app/models/user_settings.rb`: Upstream removed a setting textually adjacent to a glitch-soc-only setting. Removed the setting glitch-soc removed. |
||
---|---|---|
.. | ||
account | ||
status | ||
user | ||
attachmentable.rb | ||
browser_detection.rb | ||
cacheable.rb | ||
database_view_record.rb | ||
domain_materializable.rb | ||
domain_normalizable.rb | ||
expireable.rb | ||
follow_limitable.rb | ||
lockable.rb | ||
paginable.rb | ||
ranked_trend.rb | ||
rate_limitable.rb | ||
redisable.rb | ||
relationship_cacheable.rb | ||
remotable.rb |