Merge branch 'sitemap' of gitorious.org:~evan/statusnet/evans-mainline into sitemap

Browse Source

Conflicts:
	plugins/Sitemap/SitemapPlugin.php
	plugins/Sitemap/noticesitemap.php
	plugins/Sitemap/sitemapindex.php
	plugins/Sitemap/usersitemap.php

...

This commit is contained in:

Evan Prodromou 2010-06-01 13:56:21 -07:00

parent 1066b26424 5a9ff7c575

commit ef51cc9ad4

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available