Merge branch 'hotfix/3.5.1'

contao · Jul 24, 2015 · 6f5d80a · 6f5d80a
2 parents d11b225 + bfcc6ca
commit 6f5d80a
Show file tree

Hide file tree

Showing 124 changed files with 3,952 additions and 3,616 deletions.
diff --git a/composer.json b/composer.json
@@ -13,6 +13,7 @@
 		"php": ">=5.4.0",
 		"leafo/scssphp": "~0.1",
 		"michelf/php-markdown": "~1.4",
+		"matthiasmullie/minify": "~1.3",
 		"oyejorge/less.php": "~1.7",
 		"phpspec/php-diff": "~1.0",
 		"simplepie/simplepie": "~1.3",

diff --git a/composer.lock b/composer.lock
diff --git a/system/config/constants.php b/system/config/constants.php
@@ -13,7 +13,7 @@
  * Core version
  */
 define('VERSION', '3.5');
-define('BUILD', '0');
+define('BUILD', '1');
 define('LONG_TERM_SUPPORT', true);