Skip to content
Snippets Groups Projects
Verified Commit 6f87f0d0 authored by Sofiane Lasri's avatar Sofiane Lasri
Browse files

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/Http/Controllers/Admin/HomeController.php
parents 4d6a3312 5a4b8c3d
Branches
No related tags found
No related merge requests found
Showing
with 513 additions and 53 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment