]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'testing' into 0.9.x
authorEvan Prodromou <evan@status.net>
Sat, 20 Mar 2010 21:11:42 +0000 (16:11 -0500)
committerEvan Prodromou <evan@status.net>
Sat, 20 Mar 2010 21:11:42 +0000 (16:11 -0500)
commite458e9fe6352df6063079979b20a6924f97198f4
tree2f4f79565a061d9cdc948c0b5c792774cc68345f
parentaa6e198c12632c31dced92015f128a29f5929b98
parent99454be38cf1dc7f962441d23ccc0a59e7b05f3d
Merge branch 'testing' into 0.9.x

Conflicts:
lib/activity.php
plugins/OStatus/classes/Ostatus_profile.php