]> 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: 6580444 b4e3959)
Merge branch 'feature_fomichev_erp-380_add_lightbox_to_image_bouquetr' into 'develop'
authorMarina Zozirova <marina.zozirova@erp-flowers.ru>
Fri, 4 Apr 2025 12:32:25 +0000 (12:32 +0000)
committerMarina Zozirova <marina.zozirova@erp-flowers.ru>
Fri, 4 Apr 2025 12:32:25 +0000 (12:32 +0000)
Feature fomichev erp 380 add lightbox to image bouquetr

See merge request gitlab-instance/yii-erp24!774

1  2 
erp24/views/bouquet/index.php patch | diff1 | diff2 | blob | history
erp24/web/js/bouquet/bouquet.js patch | diff1 | diff2 | blob | history

diff --cc erp24/views/bouquet/index.php
Simple merge
diff --cc erp24/web/js/bouquet/bouquet.js
Simple merge
Unnamed repository; edit this file 'description' to name the repository.