aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Schramm <oliver.schramm97@gmail.com>2015-04-06 23:54:40 +0200
committerOliver Schramm <oliver.schramm97@gmail.com>2015-04-06 23:54:40 +0200
commitafc3730cca995fdfaab45318581a85256bc84f98 (patch)
tree912c3a66cf58903a611010a1a92a7eba6b13b387
parent201f5cb3fb064366b84bd57b123ba536cddb7721 (diff)
parent17620bba46138ec48a6748a4147986b1d21a48fd (diff)
downloadforums-afc3730cca995fdfaab45318581a85256bc84f98.tar
forums-afc3730cca995fdfaab45318581a85256bc84f98.tar.gz
forums-afc3730cca995fdfaab45318581a85256bc84f98.tar.bz2
forums-afc3730cca995fdfaab45318581a85256bc84f98.tar.xz
forums-afc3730cca995fdfaab45318581a85256bc84f98.zip
Merge branch '3.1.x'
-rw-r--r--tests/controller/helper_route_slash_test.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/controller/helper_route_slash_test.php b/tests/controller/helper_route_slash_test.php
index cb405d6317..3db5ec19e5 100644
--- a/tests/controller/helper_route_slash_test.php
+++ b/tests/controller/helper_route_slash_test.php
@@ -28,7 +28,7 @@ class phpbb_controller_helper_route_slash_test extends phpbb_controller_common_h
protected function get_base_uri()
{
- return '/phpBB3';
+ return '/phpBB3/';
}
protected function get_script_name()