Merge branch 'master' into development

wtfred · Nov 19, 2015 · 7eed44c · 7eed44c
2 parents 290e687 + 59f7cd9
commit 7eed44c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
     "preferred-install": "dist",
     "homepage": "https://fluidtypo3.org",
     "license": "GPL-2.0+",
-    "version": "2.3.3",
+    "version": "2.4.0",
     "autoload": {
         "psr-4": {
             "FluidTYPO3\\Vhs\\": "Classes/"

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -11,14 +11,14 @@
   'conflicts' => '',
   'priority' => '',
   'module' => '',
-  'state' => 'beta',
+  'state' => 'stable',
   'internal' => '',
   'uploadfolder' => 0,
   'createDirs' => '',
   'modify_tables' => '',
   'clearCacheOnLoad' => 0,
   'lockType' => '',
-  'version' => '2.3.3',
+  'version' => '2.4.0',
   'constraints' => array (
     'depends' => array(
       'php' => '5.4.0-5.6.99',