]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '0.8.x' into small-fixes
authorJeffery To <jeffery.to@gmail.com>
Tue, 23 Jun 2009 17:25:55 +0000 (01:25 +0800)
committerJeffery To <jeffery.to@gmail.com>
Tue, 23 Jun 2009 17:25:55 +0000 (01:25 +0800)
commit280f8faab4f692ff7f4389f82397adfa6db56325
tree94a076bfb3d13c7e6699e0149ee75fff6801880c
parentbb3361467c002e38aa3a424672f332b32a647e17
parenteb40fbc17ad1efb0a4c51ee00b1e9408d2af382f
Merge branch '0.8.x' into small-fixes

Conflicts:
lib/peoplesearchresults.php
lib/profilelist.php
actions/disfavor.php
actions/groups.php
lib/groupeditform.php
lib/util.php