AdminPanel-Marinov/app/Http/Controllers/Admin/ProductController.php · discountsAndGifts · Mihajlo Srebrenoski / Team4-Hackathon-Marinov-AdminPanel

Merge branch 'dev' into 'gallery' · f0836ec3

Nikola Chuchukovski authored Feb 18, 2024

# Conflicts:
#   AdminPanel-Marinov/app/Http/Controllers/Admin/ProductController.php
#   AdminPanel-Marinov/resources/views/layouts/navigation.blade.php
#   AdminPanel-Marinov/routes/web.php

f0836ec3