mirror of
https://iceshrimp.dev/blueb/Chuckya-fe-standalone.git
synced 2026-01-11 21:43:15 -08:00
Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change. |
||
|---|---|---|
| .. | ||
| account_relationships_presenter_spec.rb | ||
| instance_presenter_spec.rb | ||