mrleo1nid/h-school
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'phase/44-quarrel-fight'

Browse Source 
Co-authored-by: Cursor <cursoragent@cursor.com>

# Conflicts:
#	docs/phases/README.md
#	src/HSchool.Content/PeopleDefs.cs
#	src/HSchool.People/Roster.cs
#	src/HSchool.People/Seed.cs
This commit is contained in:
Leonid Pershin
2026-08-20 13:24:12 +03:00
parent 8d07b3606d 827c5f94d5
commit c526921779
21 changed files with 1505 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/phases/09-social/README.md
+1 -1
View File
@@ -26,7 +26,7 @@
| Фаза | Статус | Зачем |
| --- | --- | --- |
| [44. Ссора и драка](44-quarrel-fight.md) | 🔄 | Жертва задиры, заступник, извинение, двор/физкультура |
| [44. Ссора и драка](44-quarrel-fight.md) | ✅ | Жертва задиры, заступник, извинение, двор/физкультура |
| [45. Кружок в присутствии](45-presence-talk.md) | ✅ | Id участников и темы в кадре, протокол +1 |
44 и 45 стоят на 42, можно параллельно.