Merge branch 'master' of git://github.com/yiisoft/yii2 into view-begin-content-docs
Showing
yii/yiic
→
apps/bootstrap/protected/yii
100755 → 100644
| ... | @@ -69,11 +69,30 @@ | ... | @@ -69,11 +69,30 @@ |
| "bin": [ | "bin": [ | ||
| "yii/yiic" | "yii/yiic" | ||
| ], | ], | ||
| "repositories": [ | |||
| { | |||
| "type": "package", | |||
| "package": { | |||
| "name": "bestiejs/punycode.js", | |||
| "version": "1.2.1", | |||
| "dist": { | |||
| "url": "https://github.com/bestiejs/punycode.js/archive/1.2.1.zip", | |||
| "type": "zip" | |||
| }, | |||
| "source": { | |||
| "url": "https://github.com/bestiejs/punycode.js.git", | |||
| "type": "git", | |||
| "reference": "tags/1.2.1" | |||
| } | |||
| } | |||
| } | |||
| ], | |||
| "require": { | "require": { | ||
| "php": ">=5.3.0", | "php": ">=5.3.0", | ||
| "michelf/php-markdown": "1.3", | "michelf/php-markdown": "1.3", | ||
| "twig/twig": "1.12.*", | "twig/twig": "1.12.*", | ||
| "smarty/smarty": "3.1.*", | "smarty/smarty": "3.1.*", | ||
| "ezyang/htmlpurifier": "v4.5.0" | "ezyang/htmlpurifier": "v4.5.0", | ||
| "bestiejs/punycode.js": "1.2.1" | |||
| } | } | ||
| } | } |
yii/base/Vector.php
deleted
100644 → 0
This diff is collapsed.
yii/logging/DebugTarget.php
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
yii/yiic.php
→
yii/yii
100644 → 100755
This diff is collapsed.
yii/yii.bat
0 → 100644
This diff is collapsed.
Please register or sign in to comment