mirror of https://github.com/4xmen/xshop.git
Merge remote-tracking branch 'origin/master'
# Conflicts: # resources/views/segments/header/SimpleHeader/SimpleHeader.blade.phpmaster
commit
527cf862a9
# Conflicts: # resources/views/segments/header/SimpleHeader/SimpleHeader.blade.phpmaster