forked from mirrors/catstodon
c827a98f19
Conflicts: - `yarn.lock`: Not a real conflict, just a line adjacent to a glitch-soc only dependency getting updated. Updated dependencies as upstream did. |
||
---|---|---|
.. | ||
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 | ||
secrets.yml | ||
settings.yml | ||
sidekiq.yml | ||
storage.yml | ||
webpacker.yml |