]> git.mxchange.org Git - quix0rs-gnu-social.git/commit - lib/httpclient.php
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6141903 15d0055)
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
authorEvan Prodromou <evan@status.net>
Mon, 2 Nov 2009 23:13:04 +0000 (18:13 -0500)
committerEvan Prodromou <evan@status.net>
Mon, 2 Nov 2009 23:13:04 +0000 (18:13 -0500)
commita2b830392597d88c435baf54ad0df4ecda02dc41
tree08f8ddcbcab63de9117ccf82e5477fa0d565bdc6tree | snapshot
parent61419038e5747886357964a7eb3f814761482891commit | diff
parent15d0055c6f2e3b7007a82df40502e15cf5c32a13commit | diff
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

Conflicts:
classes/User.php
classes/User.php diff1 | diff2 | blob | history
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)