]> 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: 6d429ce ea8b086)
Merge remote branch 'origin/moveaccount' into moveaccount
authorEvan Prodromou <evan@status.net>
Mon, 17 Jan 2011 21:04:46 +0000 (16:04 -0500)
committerEvan Prodromou <evan@status.net>
Mon, 17 Jan 2011 21:04:46 +0000 (16:04 -0500)
Conflicts:
lib/accountmover.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. :-)