Merge branch 'master' into development

FluidTYPO3 · Nov 19, 2015 · b78a828 · b78a828
2 parents 70a0aea + 9c9e32e
commit b78a828
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "fluidtypo3/site",
     "description": "FluidTYPO3 site kickstarter",
     "type": "typo3-cms-extension",
-    "version": "1.5.1",
+    "version": "1.5.2",
     "homepage": "http://fluidtypo3.org",
     "license": "GPL-2.0+",
     "support": {

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -14,7 +14,7 @@
 	'title' => 'FluidTYPO3 site kickstarter',
 	'description' => 'Single-use site kickstarting extension - destroys itself after one use. To use: install, click configure, adjust and save. Note: may take a few minutes to finish installing after clicking install, please have patience.',
 	'category' => 'distribution',
-	'version' => '1.5.1',
+	'version' => '1.5.2',
 	'state' => 'stable',
 	'uploadfolder' => TRUE,
 	'createDirs' => '',