]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '0.8.x' into userdesign
authorEvan Prodromou <evan@controlyourself.ca>
Wed, 10 Jun 2009 04:51:24 +0000 (21:51 -0700)
committerEvan Prodromou <evan@controlyourself.ca>
Wed, 10 Jun 2009 04:51:24 +0000 (21:51 -0700)
commit4df1ea49ec75ec9dd64bc8f58c01e64ea18bedc7
tree91535b33cd2b62b0726821e4d217d587da7cd61b
parentb3628b78448266fda2368f1317e70d1cca45ac17
parented627bb4bd6424325478412055d295b185f9f662
Merge branch '0.8.x' into userdesign

Conflicts:
actions/designsettings.php
actions/designsettings.php
classes/User.php
db/laconica.sql
lib/attachmentlist.php
lib/noticelist.php