пре 12 година · ac7194e905
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
 
				     },
			
 
				     "conflict": {
			
 
				         "symfony/framework-bundle": "<2.1-dev",
			
 
				-	    "jms/di-extra-bundle": "<1.3-dev"
			
 
				+        "jms/di-extra-bundle": "<1.3-dev"
			
 
				     },
			
 
				     "require-dev": {
			
 
				         "symfony/doctrine-bridge": ">=2.1,<2.2-dev",