Conflicts: - `app/helpers/application_helper.rb`: Upstream reworked how CSS classes for the document's body are computed. Slight conflict due to glitch-soc's different theming system. Updated as upstream did. |
||
---|---|---|
.. | ||
admin | ||
api | ||
auth | ||
settings | ||
account_controller_concern.rb | ||
account_owned_concern.rb | ||
accountable_concern.rb | ||
authorization.rb | ||
cache_concern.rb | ||
challengable_concern.rb | ||
localized.rb | ||
preloading_concern.rb | ||
session_tracking_concern.rb | ||
signature_authentication.rb | ||
signature_verification.rb | ||
theming_concern.rb | ||
user_tracking_concern.rb | ||
web_app_controller_concern.rb |