mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-12-03 14:09:02 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
catstodon/app/javascript/flavours/glitch/features/ui
History
Jeremy Kescher 2cb88f5baa
Merge remote-tracking branch 'upstream/main' into develop 
Conflicts:
- .github/workflows/build-image.yml
  We don't use GitHub Actions for building Docker images.
- Gemfile.lock
  Versions were upgraded upstream that conflicted with our changes, simply applied upstream changes.
2023-03-19 01:57:28 +01:00
..
components Merge remote-tracking branch 'upstream/main' into develop 2023-03-15 14:13:29 +01:00
containers Move flavours/glitch/util/initial_state to flavours/glitch/initial_state 2022-10-11 10:17:04 +02:00
util [Glitch] Rename JSX files with proper .jsx extension 2023-02-25 14:35:31 +01:00
index.jsx Merge remote-tracking branch 'upstream/main' into develop 2023-03-19 01:57:28 +01:00