]> 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: 7ea136e d4bdb2d)
Merge branch '0.7.x' of git://gitorious.org/laconica/sgmurphy-clone into sgmurphy...
authorEvan Prodromou <evan@controlyourself.ca>
Thu, 5 Feb 2009 21:02:19 +0000 (16:02 -0500)
committerEvan Prodromou <evan@controlyourself.ca>
Thu, 5 Feb 2009 21:02:19 +0000 (16:02 -0500)
1  2 
actions/avatarsettings.php patch | diff1 | diff2 | blob | history

diff --cc actions/avatarsettings.php
Simple 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. :-)