]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
conflict resolution after pulling from mikenz
authorEvan Prodromou <evan@prodromou.name>
Sun, 13 Jul 2008 21:56:01 +0000 (17:56 -0400)
committerEvan Prodromou <evan@prodromou.name>
Sun, 13 Jul 2008 21:56:01 +0000 (17:56 -0400)
commite3f4165d6997127b7421f4db3e9ef831f79bf446
tree3bac1b11b8b0d40bd4a2b9dc4278d0377c3f7224
parentbdd0091e7077e09f1c8eb5dfc2b6e6ff2aa1fb8c
conflict resolution after pulling from mikenz

darcs-hash:20080713215601-84dde-371d54221d9ffbed500e8d3c9e0ad4bb15bd5c30.gz
actions/imsettings.php
actions/login.php