fix
Merge branch 'master' of https://github.com/netyum/yii2-blog

Conflicts:
	models/User.php
fix