]> 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: 729a0f0 b2b774a)
Merge branch 'refs/heads/feature_fomichev_erp-419_month_clear_goal' into feature_fomi...
authorfomichev <vladimir.fomichev@erp-flowers.ru>
Mon, 26 May 2025 13:34:19 +0000 (16:34 +0300)
committerfomichev <vladimir.fomichev@erp-flowers.ru>
Mon, 26 May 2025 13:34:19 +0000 (16:34 +0300)
commit3eb848a601266423a308d20d8965e4cbe8181693
tree5c7275835089a9ae44843924a6954f78b63c1c8btree | snapshot
parent729a0f093a688b18b46825f616cf593095569a64commit | diff
parentb2b774a1b6f72c54a89b0a0920c12a057cc890f9commit | diff
Merge branch 'refs/heads/feature_fomichev_erp-419_month_clear_goal' into feature_fomichev_erp-419_calculate_cleared_species_month_goal

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