mirror/blueb-Chuckya-fe-standalone
1
0
Fork 0
mirror of https://iceshrimp.dev/blueb/Chuckya-fe-standalone.git synced 2026-01-11 21:43:15 -08:00
Code Issues Projects Releases Packages Wiki Activity
blueb-Chuckya-fe-standalone/app/javascript/flavours
History
Claire f6654e0842 Merge commit '958a810553' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/admin.jsx`:
  This file was split between `app/javascript/core/admin.js`,
  `app/javascript/pack/admin.jsx`, and
  `app/javascript/flavours/glitch/packs/admin.jsx`.
  Ported upstream's change, splitting the new file to
  `app/javascript/core/admin.ts`, `app/javascript/packs/admin.tsx`,
  and `app/javascript/flavours/glitch/packs/admin.tsx`
2024-02-29 19:02:31 +01:00
..
glitch Merge commit '958a810553' into glitch-soc/merge-upstream 2024-02-29 19:02:31 +01:00
vanilla Merge commit '958a810553' into glitch-soc/merge-upstream 2024-02-29 19:02:31 +01:00