]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commitdiff
projects / erp24_rep / yii-erp24 / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a502eb8 37d653e)
Merge branch 'develop' into feature_filippov_erp-500_move_secret_to_env
authorAleksey Filippov <Aleksey.Filippov@erp-flowers.ru>
Mon, 19 Jan 2026 10:21:53 +0000 (13:21 +0300)
committerAleksey Filippov <Aleksey.Filippov@erp-flowers.ru>
Mon, 19 Jan 2026 10:21:53 +0000 (13:21 +0300)
Resolved conflicts:
- .gitignore: accepted develop version
- erp24/agents/*: accepted develop version
- erp24/services/MarketplaceService.php: accepted develop version

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
1  2 
erp24/docs/api/api2/ARCHITECTURE.md patch | diff1 | diff2 | blob | history
erp24/docs/api/api2/DEPENDENCIES.md patch | diff1 | diff2 | blob | history
erp24/docs/services/P3_SERVICES_SUMMARY.md patch | diff1 | diff2 | blob | history

diff --cc erp24/docs/api/api2/ARCHITECTURE.md
Simple merge
diff --cc erp24/docs/api/api2/DEPENDENCIES.md
Simple merge
Unnamed repository; edit this file 'description' to name the repository.