Merge branch 'develop'

simonbingham · May 26, 2014 · f9a7eb2 · f9a7eb2
2 parents b54d318 + 647ef4c
commit f9a7eb2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Application.cfc b/Application.cfc
@@ -180,7 +180,7 @@ component extends="frameworks.org.corfield.framework"{
 				, resetpasswordemailsubject = ""
 				, whitelist = "^admin#variables.framework.subsystemDelimiter#security,^public#variables.framework.subsystemDelimiter#" // list of unsecure actions - by default all requests require authentication
 			}
-			, version = "2014.1.7"
+			, version = "2014.5.26"
 		};
 		// override config in development mode
 		if(config.development){

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,7 @@
+Version 2014.5.26
+
+- Fix page_slug for sample pages.
+
 Version 2014.1.7
 
 - Improvements to code formatting.
@@ -42,4 +46,4 @@ Version 2013.2.2
 - Updated to version 2.1.1 of FW/1
 - Updated to version 1.8.3 of jQuery
 - Updated to version 1.9.2 of jQuery UI
-- Updated to version 2.2.2 of Bootstrap
+- Updated to version 2.2.2 of Bootstrap