]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '0.7.x' of git://gitorious.org/laconica/sgmurphy-clone into sgmurphy...
authorEvan Prodromou <evan@controlyourself.ca>
Thu, 5 Feb 2009 17:04:06 +0000 (12:04 -0500)
committerEvan Prodromou <evan@controlyourself.ca>
Thu, 5 Feb 2009 17:04:06 +0000 (12:04 -0500)
commit7ea136ee1ba350a64b95cd86a386f3e0d0e339d8
tree0535eb11056eaa414175bc3cba7f7f55f97d2d13
parent68a3139d0b86a2a716b24a481e677aa5d4699396
parent4ced74dc9105884fc05d4ab48e8d0162204f8c6a
Merge branch '0.7.x' of git://gitorious.org/laconica/sgmurphy-clone into sgmurphy-clone/0.7.x

Conflicts:

actions/avatarsettings.php
actions/avatarsettings.php
actions/login.php
lib/util.php