]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f7c2c19 79b2e67)
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)
Conflicts:
lib/omb.php


Trivial merge
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)