]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
authorBrion Vibber <brion@pobox.com>
Fri, 26 Feb 2010 02:52:26 +0000 (18:52 -0800)
committerBrion Vibber <brion@pobox.com>
Fri, 26 Feb 2010 02:52:26 +0000 (18:52 -0800)
1  2 
lib/activity.php
plugins/OStatus/classes/Ostatus_profile.php

Simple merge