Permalink
Browse files

Merge branch '2.1'

* 2.1:
  Add description about the upgrade of app/appKernel.php
  fixed 2.1.6 composer.lock file
  updated VENDORS for 2.1.6

Conflicts:
	composer.lock
  • Loading branch information...
2 parents 95b5e27 + 3fb0bb4 commit 59963f54f4a765998fb2ff08cbb8862a432e13e5 @fabpot fabpot committed Jan 8, 2013
Showing with 8 additions and 0 deletions.
  1. +8 −0 UPGRADE.md
View
@@ -194,6 +194,14 @@ The following bundles have been added to the list of default registered bundles:
new JMS\AopBundle\JMSAopBundle(),
new JMS\DiExtraBundle\JMSDiExtraBundle($this),
+You must also rename the DoctrineBundle from:
+
+ new Symfony\Bundle\DoctrineBundle\DoctrineBundle(),
+
+to:
+
+ new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
+
### `web/app.php`
The default `web/app.php` file now reads as follows:

0 comments on commit 59963f5

Please sign in to comment.