diff options
author | Brion Vibber <brion@pobox.com> | 2010-10-04 12:54:36 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-10-04 12:54:36 -0700 |
commit | 59119482ca34540bd7f0a2a1aa994de1d5328ea2 (patch) | |
tree | 864fdc9dda3da54a78d868339c32479b5296b6d0 /plugins/Sitemap/usersitemap.php | |
parent | 2db8aa3ec3f6804f8f16efe754aafb149f4035c9 (diff) | |
parent | 1652ded48c9c62c40157a5142e5231adbc574ddb (diff) |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
actions/hostmeta.php
actions/imsettings.php
classes/User.php
lib/adminpanelaction.php
lib/channel.php
lib/default.php
lib/router.php
lib/util.php
Diffstat (limited to 'plugins/Sitemap/usersitemap.php')
-rw-r--r-- | plugins/Sitemap/usersitemap.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/plugins/Sitemap/usersitemap.php b/plugins/Sitemap/usersitemap.php index de1200715..c39165d0e 100644 --- a/plugins/Sitemap/usersitemap.php +++ b/plugins/Sitemap/usersitemap.php @@ -40,7 +40,6 @@ if (!defined('STATUSNET')) { * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ - class UsersitemapAction extends SitemapAction { var $users = null; |