]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 20d9350 bd8f9a9)
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)
* '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


Trivial merge
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)