Merge branch '3.0/master' into 3.1/master

2011-03-29 11:48:10 -05:00 · 2011-03-29 11:48:10 -05:00 · b68b730fd0
parent cd21edb412 78ff7a7934
commit b68b730fd0
2 changed files with 2 additions and 2 deletions
--- a/classes/kohana/kostache.php
+++ b/classes/kohana/kostache.php
@ -12,7 +12,7 @@
 */
 abstract class Kohana_Kostache {

-	const VERSION = '2.0.2';
+	const VERSION = '2.0.3';

 	/**
 	 * Factory method for Kostache views. Accepts a template path and an
--- a/templates/layout.mustache
+++ b/templates/layout.mustache
@ -6,6 +6,6 @@
 	</head>
 	<body>
 		<h1>{{title}}</h1>
-		<p>{{>body}}</p>
+		<p>{{>content}}</p>
 	</body>
 </html>