]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commit
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)
commit54e5728e150bd64171820db710a291903b8ebb85
tree4a53ca7d38884ac8bf14a0b8381227788fe7db3e
parenta502eb8dbf582da4ec1952eb8319225bd8107ff8
parent37d653e6085215b9d5ffdddddb79edf5d40b4b6e
Merge branch 'develop' into feature_filippov_erp-500_move_secret_to_env

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>
erp24/docs/api/api2/ARCHITECTURE.md
erp24/docs/api/api2/DEPENDENCIES.md
erp24/docs/services/P3_SERVICES_SUMMARY.md