]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '0.8.x' into 0.9.x
authorEvan Prodromou <evan@controlyourself.ca>
Fri, 21 Aug 2009 19:42:11 +0000 (15:42 -0400)
committerEvan Prodromou <evan@controlyourself.ca>
Fri, 21 Aug 2009 19:42:11 +0000 (15:42 -0400)
commitb2664e1ae2e2cf66585cdd8696d88efdd053eb3b
tree3e406bc5502c0937f2cf81e0b4a6a1b714a1b403
parentc78772b2748f70acc8158b665218fe53b277a031
parent9f07921b45190b462e1a798622068e24ef31e124
Merge branch '0.8.x' into 0.9.x

Conflicts:
actions/updateprofile.php
actions/userauthorization.php
classes/User_group.php
index.php
install.php
lib/accountsettingsaction.php
lib/logingroupnav.php
20 files changed:
README
actions/newnotice.php
actions/profilesettings.php
actions/register.php
actions/remotesubscribe.php
actions/shownotice.php
actions/twitapistatuses.php
actions/updateprofile.php
actions/userauthorization.php
classes/Notice.php
classes/User_group.php
index.php
install.php
js/util.js
lib/action.php
lib/common.php
lib/facebookaction.php
lib/unqueuemanager.php
lib/util.php
scripts/maildaemon.php