]> 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: 566f7c4 c937d3a)
Merge branch 'moveaccount' of gitorious.org:~evan/statusnet/evans-mainline into movea...
authorEvan Prodromou <evan@status.net>
Mon, 10 Jan 2011 19:57:50 +0000 (14:57 -0500)
committerEvan Prodromou <evan@status.net>
Mon, 10 Jan 2011 19:57:50 +0000 (14:57 -0500)
Conflicts:
scripts/moveuser.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. :-)