обновил проект
Merge branch 'master' of https://github.com/range-web/sport

Conflicts:
	public_html/common/config/params.php
Merge branch 'master' of https://github.com/range-web/sport

Conflicts:
	public_html/common/config/params.php
Merge branch 'master' of https://github.com/range-web/sport
Merge branch 'master' of https://github.com/range-web/sport
Merge branch 'master' of https://github.com/range-web/sport
Merge branch 'master' of https://github.com/range-web/sport
Merge branch 'master' of https://github.com/range-web/sport
обновил
Merge branch 'master' of https://github.com/range-web/sport

Conflicts:
	public_html/common/config/params.php
Merge branch 'master' of https://github.com/range-web/sport

Conflicts:
	public_html/common/config/params.php
	public_html/statics/web/content/images/small/DSC_0221.JPG
	public_html/statics/web/content/images/small/DSC_0234.JPG
	public_html/statics/web/content/images/small/DSC_0241.JPG
	public_html/statics/web/content/images/small/DSC_0249.JPG
	public_html/statics/web/content/images/small/DSC_0286.JPG
	public_html/statics/web/content/images/small/DSC_0301.JPG
	public_html/statics/web/content/images/small/DSC_0314.JPG
	public_html/statics/web/content/images/small/DSC_0317.JPG
	public_html/statics/web/content/images/small/DSC_0328.JPG
	public_html/statics/web/content/images/small/DSC_0361.JPG
	public_html/statics/web/content/images/small/DSC_0373.JPG
	public_html/statics/web/content/images/small/DSC_0376.JPG
	public_html/statics/web/content/images/small/DSC_0383.JPG
	public_html/statics/web/content/images/small/DSC_0410.JPG