resurtm 64a6aa85f8 Merge branch 'master' of github.com:yiisoft/yii into 1980-better ...

Conflicts:
	CHANGELOG

2013-03-20 23:24:00 +06:00

..

CGoogleApi.php

change copyright symbol

2013-01-15 18:38:02 +07:00

CHtml.php

Merge branch 'master' of github.com:yiisoft/yii into 1980-better

2013-03-20 23:24:00 +06:00

CJavaScript.php

change copyright symbol

2013-01-15 18:38:02 +07:00

CJavaScriptExpression.php

remove extra parameter from constructor

2012-08-08 00:07:17 +02:00

CJSON.php

optimized by replacing a function reference with direct syntax

2013-02-02 23:37:41 +01:00