* 'mime-types-from-apache' of github.com:yiisoft/yii2:
  changelog
  generated mimeType detection file from apache http mime.types file

Conflicts:
	framework/CHANGELOG.md