Merge branch 'master' into cache

And change branch of ezpublish-kernel now that it is merged in. Conflicts: composer.json composer.lock
ezsystems · Mar 7, 2013 · 21a9bf7 · 21a9bf7
2 parents 495c264 + c5821aa
commit 21a9bf7
Show file tree

Hide file tree

Showing 174 changed files with 76 additions and 36,512 deletions.
diff --git a/composer.json b/composer.json
@@ -11,10 +11,6 @@
         }
     ],
     "repositories": [
-        {
-            "type": "vcs",
-            "url": "https://github.com/ezsystems/ezpublish-kernel.git"
-        },
         {
             "type": "vcs",
             "url": "https://github.com/andrerom/TedivmStashBundle"
@@ -28,7 +24,8 @@
         "symfony/swiftmailer-bundle": "2.2.*",
         "twig/extensions": "1.0.*",
         "tedivm/stash-bundle": "dev-blackhole",
-        "ezsystems/ezpublish-kernel": "dev-spiPersistenceCache",
+        "ezsystems/ezpublish-kernel": "dev-master",
+        "ezsystems/demobundle": "dev-master",
         "sensio/generator-bundle": "2.2.*",
         "egulias/listeners-debug-command-bundle": "dev-master"
     },

diff --git a/composer.lock b/composer.lock
diff --git a/src/.gitkeep b/src/.gitkeep