CDbCriteria::mergeWith fix
Added a line in CHANGELOG
Merge pull request #2942 from softark/cdbcriteria-mergewith-fix

CDbCriteria::mergeWith fix
Title attribute at 'CJuiTabs::headerTemplate' changed to be filled by {title}
Fixes #2945: dots in url rules should not match any character
added official support for MariaDB to the guide

fixes #2955
more documentation adjustments to mention MariaDB

fixes #2955
CFileValidator fixed to encode file name, while composing error messages.
Issue #2959 added to CHANGELOG
Merge pull request #2960 from klimov-paul/2959-file-validator-encode-filename

Fix #2959 file validator encode filename
[UK][Guide] typos
 [ci skip]
Merge pull request #2962 from yiiframework-com-ua/uk_docs

[UK][Guide] typos
Updated changelog
No longer using basename for in CAssetManager::generatePath, fixes #2963
Merge pull request #2965 from eirikhm/2963-CAssetManager-generatePath-fix

No longer using basename for in CAssetManager::generatePath, fixes #2963
Fixed ordering of changelog lines
Fixes #2658.

CBaseListView, CGridView, CListView: added note about $itemsCssClass and
$pagerCssClass properties, they must not contain empty string, null or
false values.
'CJoinQuery::createCommand()' fixed to exclude duplicating joins.
Issue #2970 added to CHANGELOG
Merge pull request #2977 from klimov-paul/2970-ar-duplicate-joins

Fix for #2970 Yii doesn't track what tables are connected