summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2012-11-02 21:46:55 +0100
committerRobin Appelman <icewind@owncloud.com>2012-11-02 21:46:55 +0100
commite312c142dc448e24d222205c0835421409b3de80 (patch)
tree15e5ebc4a7b361d950b0f5c67cb1e994607af3e7
parent4a5a36577e11e12ca9848617f2126541a2d4d3b1 (diff)
parent2dbf2c69deaf2bb8bdf02d4539756f8f6d2b9738 (diff)
downloadnextcloud-server-e312c142dc448e24d222205c0835421409b3de80.tar.gz
nextcloud-server-e312c142dc448e24d222205c0835421409b3de80.zip
Merge branch 'master' into filesystem
-rw-r--r--tests/lib/template.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/lib/template.php b/tests/lib/template.php
index d6d5a122f42..dadfdba5e0c 100644
--- a/tests/lib/template.php
+++ b/tests/lib/template.php
@@ -20,7 +20,7 @@
*
*/
-require_once("../lib/template.php");
+require_once("lib/template.php");
class Test_TemplateFunctions extends UnitTestCase {