summaryrefslogtreecommitdiff
path: root/actions/twitapisearchjson.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-02-26 11:40:12 -0500
committerEvan Prodromou <evan@status.net>2010-02-26 11:40:12 -0500
commitd9d1a77bb02227e6e79392959643404391df2ea0 (patch)
tree87ce0a41e5fed266f46af31469bdddf9c0fa3833 /actions/twitapisearchjson.php
parent417f5d653fb2053cd6194900eba591d42ebfcb0d (diff)
parentab8bb4d79e5f267323440b8cee01458b393ce2d1 (diff)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'actions/twitapisearchjson.php')
-rw-r--r--actions/twitapisearchjson.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/actions/twitapisearchjson.php b/actions/twitapisearchjson.php
index 741ed78d6..b5c006aa7 100644
--- a/actions/twitapisearchjson.php
+++ b/actions/twitapisearchjson.php
@@ -31,7 +31,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1);
}
-require_once INSTALLDIR.'/lib/api.php';
require_once INSTALLDIR.'/lib/jsonsearchresultslist.php';
/**