]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'omb2ostatus' of root@windba.gs:/var/www/statusnet into omb2ostatus
authorEvan Prodromou <evan@status.net>
Mon, 1 Mar 2010 23:08:31 +0000 (18:08 -0500)
committerEvan Prodromou <evan@status.net>
Mon, 1 Mar 2010 23:08:31 +0000 (18:08 -0500)
commit503bc5376238d946457e344591542af0595736b2
treefb99192b50bbf7ba156c5226dc7a3fd91105192b
parentf7c2c19ce89868fee5ce51d793d45c05ab209866
parent79b2e671c21e07a0512ea0ed95ed2e00e150c842
Merge branch 'omb2ostatus' of root@windba.gs:/var/www/statusnet into omb2ostatus

Conflicts:
lib/omb.php