]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1066b26 5a9ff7c)
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)
Conflicts:
plugins/Sitemap/SitemapPlugin.php
plugins/Sitemap/noticesitemap.php
plugins/Sitemap/sitemapindex.php
plugins/Sitemap/usersitemap.php


Trivial merge
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)