release v2.4.0

chekun · Nov 19, 2014 · de8fbed · de8fbed
1 parent 93d2fe1
commit de8fbed
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # DiliCMS更新日志
 
+## 版本号 2.4.0
+
+> 2014年11月14日 更新内容
+
+- CI内核升级到v2.2.0
+
 ## 版本号 2.3.3
 
 > 2014年11月14日 更新内容

diff --git a/shared/config/constant.php b/shared/config/constant.php
@@ -9,13 +9,13 @@
 |
 */
 
-	define('IN_DILICMS', TRUE);
+    define('IN_DILICMS', TRUE);
+
+    define('DILICMS_VERSION', 'V2.4.0');
 
-    define('DILICMS_VERSION', 'V2.3.1');
-
     define('DILICMS_SHARE_PATH', BASEPATH . '../shared/');
-    
+
     define('DILICMS_EXTENSION_PATH', BASEPATH . '../extensions/');
 
 /* End of file constant.php */
-/* Location: ./shared/config/constant.php */
+/* Location: ./shared/config/constant.php */
diff --git a/shared/libraries/Settings.php b/shared/libraries/Settings.php
@@ -64,7 +64,7 @@ class Settings
      * @access  private
      **/
 	private $_setting_paths = array();
-	
+
 	/**
      * 构造函数
      *
@@ -77,7 +77,7 @@ public function __construct()
 		$this->_setting_paths = array(DILICMS_SHARE_PATH . 'settings/');
 		$this->load('site', FALSE, TRUE);
 	}
-	
+
 	// ------------------------------------------------------------------------
 
     /**