Conflicts: - `app/helpers/application_helper.rb`: Upstream added a helper where glitch-soc had its own, not really a conflict. Added upstream's helper.
controllers/concerns
read:me
profile
admin
Account#unavailable?
Account#permanently_unavailable?
not_featured_by
BulkImport
use_pack
layouts/theme
@theme