]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '0.8.x' into userdesign
authorZach Copley <zach@controlyourself.ca>
Sun, 14 Jun 2009 00:23:48 +0000 (00:23 +0000)
committerZach Copley <zach@controlyourself.ca>
Sun, 14 Jun 2009 00:23:48 +0000 (00:23 +0000)
commitd0eb2058a519941e205f7b0960d9a5e0707207bb
tree37ed1aa1be3c3a7a58463964ce602565c79f8cdf
parenta887d4fe8b1f5e5adc2d701384acf50cf2cf54c3
parentdbbb3a4fb558ee4372e157612f3e053a87a53a8e
Merge branch '0.8.x' into userdesign

Conflicts:

actions/showfavorites.php
lib/action.php
actions/replies.php
lib/noticelist.php