]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Resolve conflict
authorMike Cochrane <mikec@mikenz.geek.nz>
Mon, 14 Jul 2008 02:58:53 +0000 (22:58 -0400)
committerMike Cochrane <mikec@mikenz.geek.nz>
Mon, 14 Jul 2008 02:58:53 +0000 (22:58 -0400)
commit4b8ae3e33937b4dacd2acb17d98050684ce41823
treec811be150fe6cb6f761c77f1dda7d4923e68f688
parentd9aea8cb9a99f3af302fc197314ba4da18e24723
Resolve conflict

darcs-hash:20080714025853-533db-e215a2ab0277acafc1c01d2c12c20ec452ed53e2.gz
actions/imsettings.php