Commit 2698ba1c by Tobias Munk

Merge branch 'master' of https://github.com/schmunk42/yii2

Conflicts: apps/advanced/README.md apps/basic/README.md
parents a2bfdcac 8a25953f
...@@ -73,4 +73,4 @@ php composer.phar create-project ...@@ -73,4 +73,4 @@ php composer.phar create-project
*Note: If the above command fails with `[RuntimeException] Not enough arguments.` run *Note: If the above command fails with `[RuntimeException] Not enough arguments.` run
`php composer.phar self-update` to obtain an updated version of composer which supports creating projects `php composer.phar self-update` to obtain an updated version of composer which supports creating projects
from local packages.* from local packages.*
\ No newline at end of file
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