updated AsseticBundle, rm unneeded routing entry

hd-deman · Feb 4, 2012 · 16a98fd · 16a98fd
1 parent 5e401da
commit 16a98fd
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/app/config/routing_dev.yml b/app/config/routing_dev.yml
@@ -11,10 +11,6 @@ _demo:
     type:     annotation
     prefix:   /demo
 
-_assetic:
-    resource: .
-    type:     assetic
-
 _wdt:
     resource: "@WebProfilerBundle/Resources/config/routing/wdt.xml"
     prefix:   /_wdt

diff --git a/deps b/deps
@@ -59,7 +59,7 @@
 [AsseticBundle]
     git=http://github.com/symfony/AsseticBundle.git
     target=/bundles/Symfony/Bundle/AsseticBundle
-    version=v1.0.1
+    version=origin/master
 
 [DoctrineBundle]
     git=http://github.com/doctrine/DoctrineBundle.git

diff --git a/deps.lock b/deps.lock
@@ -12,5 +12,5 @@ SensioFrameworkExtraBundle 1f661752ff051aeeca048e0be8df896faa024184
 JMSSecurityExtraBundle 541a4c242328dc04b99540c75346cc74a7c0cfb5
 SensioDistributionBundle 64ae64795c794e34d964a67e76f0584444189fc2
 SensioGeneratorBundle 0d58617cbde570803c2f00dc03f3acffce0cf28f
-AsseticBundle v1.0.1
+AsseticBundle b6a8dcc58cb2a775fee6d3c6ad9adc1943d4d1ec
 DoctrineBundle d6c923eec875d3bd622c7037b3ff879f4fdafdc8