Fixes 1140 removed unnecessary dummy registerScript in CCaptcha
Merge pull request #1141 from mdomba/1140-captcha

Fixes 1140 removed unnecessary dummy registerScript in CCaptcha
[ci skip]
Merge remote-tracking branch 'upstream/master' into CFileValidator-allowEmpty-null

Conflicts:
	CHANGELOG
updated changelog line
Merge pull request #1083 from samdark/CFileValidator-allowEmpty-null

#1083: CFileValidator is now unsafe by default. This will prevent setting attribute when no file was uploaded
* copyDirectory creates dstDir recursively.
Fix misspelled return type in PHPdoc for CMssqlCommandBuilder::checkCriteria().
Reverting PR #1141 (Issue #1140)
Merge pull request #1145 from rawtaz/phpdoc

Fix misspelled return type in PHPdoc for CMssqlCommandBuilder::checkCriteria()
removed font duplication from gii css
[docs][guide][ja] improved translations (database, caching, and extension)
[docs][guide][ja] improved translations (database, caching, and extension)
Merge branch 'docs-ja' of github.com:softark/yii into docs-ja
Merge pull request #1149 from softark/docs-ja

[ci skip] [docs][guide][ja] improved translations (database, caching, extension)
Fixes #1120 prevent duplicate processing if both events are fired
CCaptcha - set "dummy" as comment and added a description
Merge remote-tracking branch 'origin/master'
Merge pull request #1147 from gregmolnar/issue_1143

[ci skip] removed font duplication from gii css
#1073 better docs for CDefaultValueValidator
#1101 better docs for CAssetManager::publish