Merge branch 'master' of D:\OpenServer\domains\hml.dev with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/site/private_inv.blade.php
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
доверстка3
Merge remote-tracking branch 'origin/master'