diff options
author | Zach Copley <zach@controlyourself.ca> | 2009-09-08 16:02:57 -0700 |
---|---|---|
committer | Zach Copley <zach@controlyourself.ca> | 2009-09-08 16:02:57 -0700 |
commit | 9d87313eaebe8240393ac300a435f3b1332c8849 (patch) | |
tree | 6b7e7d69c63fc6801ad95477be9c11ccb7cd0a1a /scripts/sitemap.php | |
parent | 5efe588174c71979fc1970353c9a556ea441f138 (diff) | |
parent | beae3db41375879e725af053edf8041bbd76ac8c (diff) |
Merge branch '0.9.x' into pluginize-twitter-bridge
Conflicts:
plugins/TwitterBridge/twitterauthorization.php
Diffstat (limited to 'scripts/sitemap.php')
-rwxr-xr-x | scripts/sitemap.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/sitemap.php b/scripts/sitemap.php index 88ca2ba7a..f8c392146 100755 --- a/scripts/sitemap.php +++ b/scripts/sitemap.php @@ -1,8 +1,8 @@ #!/usr/bin/env php <?php /* - * Laconica - a distributed open-source microblogging tool - * Copyright (C) 2008, 2009, Control Yourself, Inc. + * StatusNet - the distributed open-source microblogging tool + * Copyright (C) 2008, 2009, StatusNet, Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by |