]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Resolve conflicts after pull from evan
authormikec <mikec@mikenz.geek.nz>
Mon, 21 Jul 2008 13:56:37 +0000 (09:56 -0400)
committermikec <mikec@mikenz.geek.nz>
Mon, 21 Jul 2008 13:56:37 +0000 (09:56 -0400)
commita4fa34cecbd038fb2cc323aefd2b32739aaee7d5
tree040f9ea3ee60f79c814d6732e5360a0dc687428d
parentd48609ac51f9f7aa5b57df1e9ab9aa7353721c00
Resolve conflicts after pull from evan

darcs-hash:20080721135637-edabd-cca33bc0a0936423b9fd2ffdf9413236123d680e.gz
actions/emailsettings.php
actions/profilesettings.php
classes/User.php
classes/stoica.ini
db/laconica.sql
lib/common.php