blueb-Chuckya-fe-standalone/config/routes
Claire 1f796d129d Merge commit '598ae4f2da' into glitch-soc/merge-upstream
Conflicts:
- `config/routes/api.rb`:
  Upstream added an endpoint, textually close to a glitch-soc-only endpoint.
  Ported upstream changes.
2024-07-30 20:47:34 +02:00
..
admin.rb Merge commit '1229d2907a' into glitch-soc/merge-upstream 2024-07-29 19:16:58 +02:00
api.rb Merge commit '598ae4f2da' into glitch-soc/merge-upstream 2024-07-30 20:47:34 +02:00
settings.rb Merge commit '967505ee9b' into glitch-soc/merge-upstream 2024-07-09 20:39:09 +02:00