Conflicts: - `app/helpers/application_helper.rb`: Upstream added a helper close to a glitch-soc one. Added upstream's helper.
Conflicts: - `app/helpers/application_helper.rb`: Upstream added a helper close to a glitch-soc one. Added upstream's helper.