summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2019-01-08 16:55:37 +0100
committerAndrey Andreev <narf@devilix.net>2019-01-08 16:55:37 +0100
commit7ec458b45316b9f270e1e03de498244f71c605ea (patch)
treea110bf9c71b49a69beec49d1874f423375cd0fd1 /tests
parent67563c64025085e61598a83fef3e25bef38b32c4 (diff)
parent12ee9843877bf80159d1d89a0e3a4f170e902725 (diff)
Merge branch '3.1-stable' into develop
Conflicts resolved: system/database/drivers/sqlite/sqlite_driver.php system/database/drivers/sqlite/sqlite_forge.php system/database/drivers/sqlite/sqlite_result.php system/database/drivers/sqlite/sqlite_utility.php system/helpers/captcha_helper.php system/helpers/email_helper.php system/helpers/inflector_helper.php system/helpers/smiley_helper.php system/language/english/form_validation_lang.php system/libraries/Cart.php system/libraries/Form_validation.php system/libraries/Javascript.php system/libraries/Javascript/Jquery.php system/libraries/Session/SessionHandlerInterface.php tests/codeigniter/helpers/inflector_helper_test.php user_guide_src/source/helpers/inflector_helper.rst
Diffstat (limited to 'tests')
-rw-r--r--tests/codeigniter/helpers/inflector_helper_test.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/codeigniter/helpers/inflector_helper_test.php b/tests/codeigniter/helpers/inflector_helper_test.php
index 8c4f9e51f..f4c524ef6 100644
--- a/tests/codeigniter/helpers/inflector_helper_test.php
+++ b/tests/codeigniter/helpers/inflector_helper_test.php
@@ -112,4 +112,4 @@ class Inflector_helper_test extends CI_TestCase {
$this->assertEquals($expect, ordinal_format($str));
}
}
-} \ No newline at end of file
+}