Merge remote-tracking branch 'origin/master'

# Conflicts:
#	resources/views/segments/header/SimpleHeader/SimpleHeader.blade.php
master
A1Gard 8 months ago
commit 527cf862a9

Diff Content Not Available