шестой
Merge branch 'master' of https://github.com/WMTV/oranger

Conflicts:
	mysql/ibdata1
	mysql/oranger/do77s_assets.ibd
	mysql/oranger/do77s_categories.ibd
	mysql/oranger/do77s_content.ibd
	mysql/oranger/do77s_session.ibd
шестой_