Skip to content

Y
yii2
Commit 4ca55a81 by Qiang Xue
Options

Merge pull request #5304 from faxriddin/master

solved conflict
parents 15435c17 5324d446
Showing with 0 additions and 7 deletions
docs/guide-uz/README.md
...@@ -3,7 +3,6 @@ Yii 2.0 bo`yicha to`liq qo`llanma ...@@ -3,7 +3,6 @@ Yii 2.0 bo`yicha to`liq qo`llanma
Ushbu qo`llanma [Yii qo`llanmalarining holati bilan](http://www.yiiframework.com/doc/terms/) bilan mos holda yo`lga qo`yildi. Ushbu qo`llanma [Yii qo`llanmalarining holati bilan](http://www.yiiframework.com/doc/terms/) bilan mos holda yo`lga qo`yildi.
<<<<<<< HEAD
All Rights Reserved. All Rights Reserved.
2014 © Yii Software LLC. 2014 © Yii Software LLC.
...@@ -203,8 +202,3 @@ Xelperlar ...@@ -203,8 +202,3 @@ Xelperlar
* **TBD** [Html](helper-html.md) * **TBD** [Html](helper-html.md)
* **TBD** [Url](helper-url.md) * **TBD** [Url](helper-url.md)
* **TBD** [Security](helper-security.md) * **TBD** [Security](helper-security.md)
\ No newline at end of file
=======
Barcha huquqlar ximoyalangan.
2014 © Yii Software LLC.
>>>>>>> 6a3cce2e267f590c38f910d571adea6a38028329
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment