Conflicts: - `app/helpers/application_helper.rb`: Not a real conflict, just upstream adding a method textually adjacent to glitch-soc only code. Ported upstream's change. |
||
|---|---|---|
| .. | ||
| cli | ||
| migration_helpers.rb | ||
| migration_warning.rb | ||
| rack_middleware.rb | ||
| redis_config.rb | ||
| sidekiq_middleware.rb | ||
| snowflake.rb | ||
| version.rb | ||