<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/language/en/pagination.php
+++ b/tests/application/language/en/pagination.php
@@ -0,0 +1,19 @@
+<?php 
+
+return array(
+
+	/*
+	|--------------------------------------------------------------------------
+	| Pagination Language Lines
+	|--------------------------------------------------------------------------
+	|
+	| The following language lines are used by the paginator library to build
+	| the pagination links. You're free to change them to anything you want.
+	| If you come up with something more exciting, let us know.
+	|
+	*/
+
+	'previous' => '&laquo; Previous',
+	'next'     => 'Next &raquo;',
+
+);