diff options
| author | Evan Prodromou <evan@status.net> | 2010-06-01 13:56:21 -0700 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-06-01 13:56:21 -0700 |
| commit | ef51cc9ad4a37d6dcd2129828284def1c90d7402 (patch) | |
| tree | b080b57b7fffff0576a891ad19e88bb2b3a3b7c7 | |
| parent | 1066b264247811ec9371ff2f473f5d7f2a6dd98a (diff) | |
| parent | 5a9ff7c575fb2b23d8b7b3eaf896852bb3501b80 (diff) | |
Merge branch 'sitemap' of gitorious.org:~evan/statusnet/evans-mainline into sitemap
Conflicts:
plugins/Sitemap/SitemapPlugin.php
plugins/Sitemap/noticesitemap.php
plugins/Sitemap/sitemapindex.php
plugins/Sitemap/usersitemap.php
0 files changed, 0 insertions, 0 deletions