mirror of
https://iceshrimp.dev/blueb/Chuckya-fe-standalone.git
synced 2026-01-12 22:13:16 -08:00
Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other). |
||
|---|---|---|
| .. | ||
| bookmarks_controller.rb | ||
| favourited_by_accounts_controller.rb | ||
| favourites_controller.rb | ||
| mutes_controller.rb | ||
| pins_controller.rb | ||
| reblogged_by_accounts_controller.rb | ||
| reblogs_controller.rb | ||