]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commit
projects / erp24_rep / yii-erp24 / .git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d1deabc 80f8d8b)
Merge branch 'develop' into feature-zozirova-erp_256-send_doc_on_1c
authormarina <m.zozirova@gmail.com>
Wed, 18 Dec 2024 10:04:13 +0000 (13:04 +0300)
committermarina <m.zozirova@gmail.com>
Wed, 18 Dec 2024 10:04:13 +0000 (13:04 +0300)
commit6757f3f46b5a308a7b6eaf7547ac92a942ac5319
tree2f845d12dc393d0a7465f1d7ca31a2a762c7e238tree | snapshot
parentd1deabca20b11fd33e454a167765e1712d494290commit | diff
parent80f8d8bb29b5812c3d5055e34d12ea7412d53a5bcommit | diff
Merge branch 'develop' into feature-zozirova-erp_256-send_doc_on_1c

# Conflicts:
# erp24/api2/controllers/DataController.php
erp24/api2/controllers/DataController.php diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.