]> 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: 25544af d9c1525)
Merge branch 'develop' into feature-zozirova-erp_256-send_doc_on_1c
authormarina <m.zozirova@gmail.com>
Thu, 19 Dec 2024 10:59:47 +0000 (13:59 +0300)
committermarina <m.zozirova@gmail.com>
Thu, 19 Dec 2024 10:59:47 +0000 (13:59 +0300)
commit574fd620a9cf4dfe722946eac56787099518f344
treea5313789474f97f2792aa223962adf3fff942213tree | snapshot
parent25544af4560ef999085e69860c1327b793de0c16commit | diff
parentd9c1525c34a4b64674546f733372ee1b8a21854acommit | 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.