]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Missed a couple of conflicts
authorZach Copley <zach@status.net>
Mon, 28 Feb 2011 23:51:46 +0000 (15:51 -0800)
committerZach Copley <zach@status.net>
Mon, 28 Feb 2011 23:51:46 +0000 (15:51 -0800)
commitf3ffc8bc46ebe5f2329bdf54fa28d4832c3a02f9
tree812ced753d8d39db04f72713b874395e2ee541cf
parentb7d07466943a73e1c009467c8daa6e499810080f
Missed a couple of conflicts
actions/imsettings.php
lib/userprofile.php