]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a0c255e 90d34b2)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
authorEvan Prodromou <evan@status.net>
Tue, 23 Feb 2010 21:02:27 +0000 (16:02 -0500)
committerEvan Prodromou <evan@status.net>
Tue, 23 Feb 2010 21:02:27 +0000 (16:02 -0500)
commitb09304a6c4553044983176fb2740206777868378
tree612381c27789be05070d4e7ca03d8f05fff58d5etree | snapshot
parenta0c255e231a84cf77554cc3c0a095eae7b0ffd9ccommit | diff
parent90d34b26c66ceb5d37a9c2782356b46361a523cccommit | diff
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

Conflicts:
plugins/OStatus/OStatusPlugin.php
plugins/OStatus/OStatusPlugin.php diff1 | diff2 | blob | history
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)