]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'sitemap' of gitorious.org:~evan/statusnet/evans-mainline into sitemap
authorEvan Prodromou <evan@status.net>
Tue, 1 Jun 2010 20:56:21 +0000 (13:56 -0700)
committerEvan Prodromou <evan@status.net>
Tue, 1 Jun 2010 20:56:21 +0000 (13:56 -0700)
commitef51cc9ad4a37d6dcd2129828284def1c90d7402
treeb080b57b7fffff0576a891ad19e88bb2b3a3b7c7
parent1066b264247811ec9371ff2f473f5d7f2a6dd98a
parent5a9ff7c575fb2b23d8b7b3eaf896852bb3501b80
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