From: Zach Copley Date: Tue, 16 Jun 2009 03:25:36 +0000 (-0700) Subject: Merge branch 'userdesign' of ssh://zach@dev.controlyourself.ca/mnt/www/design into... X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9dce5d00f14e2a866633fc717ea9099429b2e7ea;p=quix0rs-gnu-social.git Merge branch 'userdesign' of ssh://zach@dev.controlyourself.ca/mnt/www/design into userdesign * 'userdesign' of ssh://zach@dev.controlyourself.ca/mnt/www/design: Converts user entry in the form of '#1B2' into '#11BB22' for user Updated swatch numbering Conflicts: actions/designsettings.php --- 9dce5d00f14e2a866633fc717ea9099429b2e7ea