]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Fixed up conflict (over white space) in User.php
authorZach Copley <zach@controlyourself.ca>
Sun, 5 Oct 2008 18:13:50 +0000 (14:13 -0400)
committerZach Copley <zach@controlyourself.ca>
Sun, 5 Oct 2008 18:13:50 +0000 (14:13 -0400)
commite115322473a0b9239e3ce3502fcdbe85fdf388d7
tree43083ab268f9b719b63038822cbd77639a278d00
parentfd90290d935b0ea032940f89236df86694bfb44e
Fixed up conflict (over white space) in User.php

darcs-hash:20081005181350-7b5ce-1e722af0bd3677b27dd6d100456131a42072dd91.gz
classes/User.php