mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-12-04 22:39:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
catstodon/app/views/settings/preferences/appearance
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
..
show.html.haml Merge remote-tracking branch 'upstream/main' into develop 2023-03-19 01:57:28 +01:00