<auto> merging hotfixes. re-added tests into repository.

2012-03-27 15:47:04 -05:00
parent 8b4c17a8b6
commit 9eabd73b64
79 changed files with 6418 additions and 0 deletions
--- a/tests/application/controllers/template/basic.php
+++ b/tests/application/controllers/template/basic.php
@@ -0,0 +1,12 @@
+<?php
+
+class Template_Basic_Controller extends Controller {
+
+	public $layout = 'home.index';
+
+	public function action_index()
+	{
+		//
+	}
+
+}