]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '0.8.x' into 0.9.x
authorEvan Prodromou <evan@status.net>
Thu, 27 Aug 2009 18:16:45 +0000 (11:16 -0700)
committerEvan Prodromou <evan@status.net>
Thu, 27 Aug 2009 18:16:45 +0000 (11:16 -0700)
commit5d09b6b3f0595540c66b703ae085f0af904fe30f
tree59269a4dacf90bbab9f0ff63afff4bf1781a1240
parentf1fda6c0503e32edfc99b297f4bf2cb07e629d9e
parent82b0927f5838f3c12816e03712df9460a9f77b72
Merge branch '0.8.x' into 0.9.x

Conflicts:
EVENTS.txt
actions/finishremotesubscribe.php
actions/postnotice.php
actions/public.php
actions/remotesubscribe.php
actions/showstream.php
actions/updateprofile.php
actions/userauthorization.php
classes/laconica.ini
lib/common.php
lib/oauthstore.php
lib/omb.php
70 files changed:
EVENTS.txt
README
actions/accesstoken.php
actions/all.php
actions/confirmaddress.php
actions/doc.php
actions/editgroup.php
actions/favorited.php
actions/finishremotesubscribe.php
actions/groupsearch.php
actions/invite.php
actions/login.php
actions/logout.php
actions/newgroup.php
actions/newmessage.php
actions/newnotice.php
actions/noticesearch.php
actions/postnotice.php
actions/profilesettings.php
actions/public.php
actions/publictagcloud.php
actions/register.php
actions/remotesubscribe.php
actions/replies.php
actions/requesttoken.php
actions/showfavorites.php
actions/showgroup.php
actions/shownotice.php
actions/showstream.php
actions/subscribers.php
actions/twitapidirect_messages.php
actions/twitapistatuses.php
actions/updateprofile.php
actions/userauthorization.php
actions/xrds.php
classes/Notice.php
classes/Profile.php
classes/User.php
classes/statusnet.ini
config.php.sample
db/statusnet.sql
db/statusnet_pg.sql
doc-src/help
index.php
install.php
js/util.js
lib/accountsettingsaction.php
lib/action.php
lib/command.php
lib/common.php
lib/facebookaction.php
lib/groupeditform.php
lib/logingroupnav.php
lib/messageform.php
lib/noticeform.php
lib/oauthstore.php
lib/omb.php
lib/router.php
lib/settingsaction.php
lib/unqueuemanager.php
lib/util.php
plugins/OpenID/finishaddopenid.php
plugins/OpenID/finishopenidlogin.php
plugins/OpenID/openid.php
plugins/OpenID/openidlogin.php
plugins/OpenID/openidsettings.php
plugins/OpenID/publicxrds.php
scripts/maildaemon.php
scripts/ombqueuehandler.php
scripts/xmppdaemon.php