nyastodon/config
Claire c827a98f19 Merge commit 'd20a5c3ec9ed40a991245fe32d0acb6187dd48c4' into glitch-soc/merge-upstream
Conflicts:
- `yarn.lock`:
  Not a real conflict, just a line adjacent to a glitch-soc only dependency
  getting updated.
  Updated dependencies as upstream did.
2024-05-29 17:03:24 +02:00
..
environments Merge commit '1bf661cddbc614d4076e9d9e855575fc29e976c0' into glitch-soc/merge-upstream 2024-05-14 20:47:14 +02:00
imagemagick Ensure custom favicon is converted to PNG and ICO (#30208) 2024-05-07 18:15:17 +00:00
initializers Merge commit 'd20a5c3ec9ed40a991245fe32d0acb6187dd48c4' into glitch-soc/merge-upstream 2024-05-29 17:03:24 +02:00
locales New Crowdin Translations (automated) (#30452) 2024-05-28 08:05:37 +00:00
locales-glitch New Crowdin Translations (automated) (#2668) 2024-04-06 18:18:06 +02:00
routes Merge commit '2fe1b8d1695d8faa452a69872fde94ccc4611576' into glitch-soc/merge-upstream 2024-05-06 17:53:51 +02:00
templates
webpack Replace use_pack, layouts/theme and @theme by new helpers 2024-04-28 15:45:42 +02:00
application.rb Fix OpenSearch compatibility issue (#30278) 2024-05-14 17:54:28 +00:00
boot.rb
brakeman.yml
database.yml
environment.rb
formatjs-formatter.js
i18n-tasks.yml
navigation.rb Merge commit '2c5ab8f647841ea8075ece50ccc9e12c21af8720' into glitch-soc/merge-upstream 2024-05-22 21:05:19 +02:00
pghero.yml
puma.rb
roles.yml
routes.rb Merge commit '2fe1b8d1695d8faa452a69872fde94ccc4611576' into glitch-soc/merge-upstream 2024-05-06 17:53:51 +02:00
secrets.yml
settings.yml Merge commit '02ea16150647ac3baf0bb8a89203ccc7200b4a2f' into glitch-soc/merge-upstream 2024-05-01 14:25:47 +02:00
sidekiq.yml
storage.yml
webpacker.yml Merge commit '3f6887557b23d363e7f8f18518db4447739d64bb' into glitch-soc/merge-upstream 2024-05-04 14:59:00 +02:00