diff options
| author | Zach Copley <zach@controlyourself.ca> | 2009-06-15 20:25:36 -0700 |
|---|---|---|
| committer | Zach Copley <zach@controlyourself.ca> | 2009-06-15 20:25:36 -0700 |
| commit | 9dce5d00f14e2a866633fc717ea9099429b2e7ea (patch) | |
| tree | b35d4da75f1a612effefd2692082fc54fcfae356 /favicon.ico | |
| parent | 20d93508776398627f5aff64b83bd20a362cb45d (diff) | |
| parent | bd8f9a979acb1607e00499dfba223a51b57596af (diff) | |
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
Diffstat (limited to 'favicon.ico')
0 files changed, 0 insertions, 0 deletions