]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'work' into testing
authorBrion Vibber <brion@pobox.com>
Tue, 2 Mar 2010 00:57:58 +0000 (16:57 -0800)
committerBrion Vibber <brion@pobox.com>
Tue, 2 Mar 2010 00:57:58 +0000 (16:57 -0800)
1  2 
plugins/OStatus/classes/Ostatus_profile.php
plugins/OStatus/lib/xrd.php

Simple merge