]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commit
Merge branch 'refs/heads/develop' into feature_fomichev_erp_177_store_cluster_update
authorvladfo <fvv2011@gmail.com>
Tue, 24 Sep 2024 12:43:33 +0000 (15:43 +0300)
committervladfo <fvv2011@gmail.com>
Tue, 24 Sep 2024 12:43:33 +0000 (15:43 +0300)
commit61dcba1e87bb8e38532cad2379af3ee3b4717fa8
tree80ccbb95a36e2f62fe96fc3ca3763e5a94aa5f6a
parentc0ab712653bcc8bb79b613227b4d1b4fb2059ef1
parent245d44d7387aaebc57247fbe54c62a8d7535bd34
Merge branch 'refs/heads/develop' into feature_fomichev_erp_177_store_cluster_update

# Conflicts:
# erp24/web/css/select2-container-and-other-styles-fix.css
erp24/web/css/select2-container-and-other-styles-fix.css