Skip to content

Y
yii2
Commit febbf316 by Klimov Paul
Options

Merge branch 'master' of github.com:yiisoft/yii2

parents cb22fd9c a856ddb6
Showing with 9 additions and 8 deletions
apps/bootstrap/composer.json
...@@ -12,9 +12,6 @@ ...@@ -12,9 +12,6 @@
"irc": "irc://irc.freenode.net/yii", "irc": "irc://irc.freenode.net/yii",
"source": "https://github.com/yiisoft/yii2" "source": "https://github.com/yiisoft/yii2"
}, },
"config": {
"vendor-dir": "vendor"
},
"minimum-stability": "dev", "minimum-stability": "dev",
"require": { "require": {
"php": ">=5.3.0", "php": ">=5.3.0",
......
yii/composer.json
...@@ -64,10 +64,14 @@ ...@@ -64,10 +64,14 @@
"source": "https://github.com/yiisoft/yii2" "source": "https://github.com/yiisoft/yii2"
}, },
"require": { "require": {
"php": ">=5.3.0", "php": ">=5.3.11",
"michelf/php-markdown": "1.3", "ext-mbstring": "*",
"twig/twig": "1.12.*", "lib-pcre": "*"
"smarty/smarty": "3.1.*", },
"ezyang/htmlpurifier": "v4.5.0" "suggest": {
"michelf/php-markdown": "Required for Markdown helper.",
"twig/twig": "Required for TwigViewRenderer.",
"smarty/smarty": "Required for SmartyViewRenderer.",
"ezyang/htmlpurifier": "Required for Purifier helper."
} }
} }
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