Conflicts: - `spec/system/settings/preferences/appearance_spec.rb`: Upstream tests for changing themes in there, but glitch-soc has its own place for that. Updated upstream's change while skipping the theme test. |
||
---|---|---|
.. | ||
preferences | ||
applications_spec.rb | ||
exports_spec.rb | ||
login_activities_spec.rb | ||
migrations_spec.rb | ||
profiles_spec.rb | ||
verifications_spec.rb |