diff options
author | Evan Prodromou <evan@status.net> | 2010-03-20 16:11:42 -0500 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-03-20 16:11:42 -0500 |
commit | e458e9fe6352df6063079979b20a6924f97198f4 (patch) | |
tree | 2f4f79565a061d9cdc948c0b5c792774cc68345f /lib/common.php | |
parent | aa6e198c12632c31dced92015f128a29f5929b98 (diff) | |
parent | 99454be38cf1dc7f962441d23ccc0a59e7b05f3d (diff) |
Merge branch 'testing' into 0.9.x
Conflicts:
lib/activity.php
Diffstat (limited to 'lib/common.php')
-rw-r--r-- | lib/common.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/common.php b/lib/common.php index 5d53270e3..334a88ffd 100644 --- a/lib/common.php +++ b/lib/common.php @@ -123,7 +123,6 @@ require_once INSTALLDIR.'/lib/util.php'; require_once INSTALLDIR.'/lib/action.php'; require_once INSTALLDIR.'/lib/mail.php'; require_once INSTALLDIR.'/lib/subs.php'; -require_once INSTALLDIR.'/lib/activity.php'; require_once INSTALLDIR.'/lib/clientexception.php'; require_once INSTALLDIR.'/lib/serverexception.php'; |