]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
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)
commite30af99873ceda83bb4e9a2e221da894e8363489
tree4e1db1ce277b4643c0e2610adcb94fe4ada29eb3
parent45e8819c1b9cc618e9b2d6678b0ff14c653a09d3
parent493b5479c15f0e135054fd6b961e50e690077eda
Merge branch 'work' into testing
plugins/OStatus/classes/Ostatus_profile.php
plugins/OStatus/lib/xrd.php