Merge tag 'v1.4.1' into demo_master

Conflicts: composer.lock
ezsystems · Jul 27, 2016 · 2908044 · 2908044
2 parents 2448775 + cf0f95a
commit 2908044
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 46 deletions.
diff --git a/composer.json b/composer.json
@@ -32,10 +32,10 @@
         "sensio/generator-bundle": "~2.3",
         "incenteev/composer-parameter-handler": "~2.0",
         "tedivm/stash-bundle": "~0.4",
-        "ezsystems/ezpublish-kernel": "^6.4@rc",
+        "ezsystems/ezpublish-kernel": "^6.4",
         "ezsystems/repository-forms": "^1.3",
         "ezsystems/ezplatform-solr-search-engine": "^1.0",
-        "ezsystems/platform-ui-bundle": "^1.4@rc",
+        "ezsystems/platform-ui-bundle": "^1.4",
         "ezsystems/ez-support-tools": "~0.1.0",
         "egulias/listeners-debug-command-bundle": "~1.9",
         "white-october/pagerfanta-bundle": "1.0.*",

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