dfe851b476
Conflicts: - `app/helpers/application_helper.rb`: Upstream added a helper where glitch-soc had its own, not really a conflict. Added upstream's helper. |
||
|---|---|---|
| .. | ||
| environments | ||
| imagemagick | ||
| initializers | ||
| locales | ||
| locales-glitch | ||
| routes | ||
| templates | ||
| webpack | ||
| application.rb | ||
| boot.rb | ||
| brakeman.yml | ||
| database.yml | ||
| environment.rb | ||
| formatjs-formatter.js | ||
| i18n-tasks.yml | ||
| navigation.rb | ||
| pghero.yml | ||
| puma.rb | ||
| roles.yml | ||
| routes.rb | ||
| settings.yml | ||
| sidekiq.yml | ||
| storage.yml | ||
| webpacker.yml | ||