update to beta1

nella · Sep 15, 2012 · b65ecd7 · b65ecd7
1 parent 6968106
commit b65ecd7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/app/config/local.neon b/app/config/local.neon
@@ -8,15 +8,17 @@ doctrine:
 			console: true
 
 media:
-	entityManager: @doctrine.entityManagers.default
+	entityManager: @doctrine.entityManager
 
 
 model:
-	entityManager: @doctrine.entityManagers.default
+	entityManager: @doctrine.entityManager
 
 services:
 	cacheStorage:
 		class: Nette\Caching\Storages\MemoryStorage
 	templateCacheStorage:
 		class: Nette\Caching\Storages\MemoryStorage
 		autowired: no
+
+diagnostics:
diff --git a/composer.json b/composer.json
@@ -20,6 +20,10 @@
 	},
 	"require": {
 		"php": ">= 5.3.2",
-		"nella/framework": "dev-master"
+		"nella/framework": "@dev",
+		"doctrine/common": "2.3.*@rc",
+		"doctrine/dbal": "2.3.*@rc",
+		"doctrine/orm": "2.3.*@rc",
+		"doctrine/migrations": "@dev"
 	}
 }