Merge branch 'dev' into 'gallery'
# Conflicts: # AdminPanel-Marinov/app/Http/Controllers/Admin/ProductController.php # AdminPanel-Marinov/resources/views/layouts/navigation.blade.php # AdminPanel-Marinov/routes/web.php
Showing
+257 -39
Please register or sign in to comment