Merge branch '1.3.x.x' into 1.3-jshelper

This commit is contained in:
mark_story 2009-03-07 11:10:11 -05:00
commit 9022784628

View file

@ -29,7 +29,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta http-equiv='content-Type' content='text/html; <?php echo $characterSet; ?>' /> <meta http-equiv='content-Type' content='text/html; <?php echo $characterSet; ?>' />
<title>CakePHP Test Suite v 1.2.0.0</title> <title>CakePHP Test Suite v 1.3.0.0</title>
<style type="text/css"> <style type="text/css">
h3 {font-size: 170%; padding-top: 1em} h3 {font-size: 170%; padding-top: 1em}
a {font-size: 120%} a {font-size: 120%}
@ -129,4 +129,4 @@
<h1>CakePHP: the rapid development php framework</h1> <h1>CakePHP: the rapid development php framework</h1>
</div> </div>
<div id="content"> <div id="content">
<h2>CakePHP Test Suite v 1.2.0.0</h2> <h2>CakePHP Test Suite v 1.3.0.0</h2>