]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'userdesign' of ssh://zach@dev.controlyourself.ca/mnt/www/design into...
authorZach Copley <zach@controlyourself.ca>
Tue, 16 Jun 2009 03:25:36 +0000 (20:25 -0700)
committerZach Copley <zach@controlyourself.ca>
Tue, 16 Jun 2009 03:25:36 +0000 (20:25 -0700)
commit9dce5d00f14e2a866633fc717ea9099429b2e7ea
treeb35d4da75f1a612effefd2692082fc54fcfae356
parent20d93508776398627f5aff64b83bd20a362cb45d
parentbd8f9a979acb1607e00499dfba223a51b57596af
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