• Zach Copley's avatar
    Merge branch '0.9.x' into 1.0.x · b7d07466
    Zach Copley authored
    Conflicts:
    	actions/confirmaddress.php
    	actions/emailsettings.php
    	actions/hostmeta.php
    	actions/imsettings.php
    	actions/login.php
    	actions/profilesettings.php
    	actions/showgroup.php
    	actions/smssettings.php
    	actions/urlsettings.php
    	actions/userauthorization.php
    	actions/userdesignsettings.php
    	classes/Memcached_DataObject.php
    	index.php
    	lib/accountsettingsaction.php
    	lib/action.php
    	lib/common.php
    	lib/connectsettingsaction.php
    	lib/designsettings.php
    	lib/personalgroupnav.php
    	lib/profileaction.php
    	lib/userprofile.php
    	plugins/ClientSideShorten/ClientSideShortenPlugin.php
    	plugins/Facebook/FBConnectSettings.php
    	plugins/Facebook/FacebookPlugin.php
    	plugins/NewMenu/NewMenuPlugin.php
    	plugins/NewMenu/newmenu.css
    b7d07466
Name
Last commit
Last update
..
SearchMonkey-MrH.0.txt Loading commit data...
SearchMonkey-Om3.0.txt Loading commit data...
SearchMonkey-yQP.0.txt Loading commit data...
allsites.php Loading commit data...
apidocs.config Loading commit data...
backupuser.php Loading commit data...
checkschema.php Loading commit data...
clear_jabber.php Loading commit data...
clearcache.php Loading commit data...
cleardb.sh Loading commit data...
command.php Loading commit data...
commandline.inc Loading commit data...
console.php Loading commit data...
createsim.php Loading commit data...
decache.php Loading commit data...
delete_status_network.sh Loading commit data...
deletegroup.php Loading commit data...
deleteuser.php Loading commit data...
docgen.php Loading commit data...
doxygen.tmpl Loading commit data...
dumpschema.php Loading commit data...
fixup_blocks.php Loading commit data...
fixup_conversations.php Loading commit data...
fixup_deletions.php Loading commit data...
fixup_files.php Loading commit data...
fixup_group_uri.php Loading commit data...
fixup_hashtags.php Loading commit data...
fixup_inboxes.php Loading commit data...
fixup_notices_rendered.php Loading commit data...
fixup_replies.php Loading commit data...
fixup_status_network.php Loading commit data...
fixup_utf8.php Loading commit data...
flushrouter.php Loading commit data...
flushsite.php Loading commit data...
getpiddir.php Loading commit data...
getvaliddaemons.php Loading commit data...
handlequeued.php Loading commit data...
imdaemon.php Loading commit data...
importtwitteratom.php Loading commit data...
init_conversation.php Loading commit data...
initializeinbox.php Loading commit data...
install_cli.php Loading commit data...
maildaemon.php Loading commit data...
make-release.php Loading commit data...
makegroupadmin.php Loading commit data...
moveuser.php Loading commit data...
queuectl.php Loading commit data...
queuedaemon.php Loading commit data...
rebuilddb.sh Loading commit data...
rebuilddb_psql.sh Loading commit data...
registeruser.php Loading commit data...
reportsnapshot.php Loading commit data...
restoreuser.php Loading commit data...
sendemail.php Loading commit data...
sessiongc.php Loading commit data...
setconfig.php Loading commit data...
setpassword.php Loading commit data...
settag.php Loading commit data...
setup.cfg.sample Loading commit data...
setup_status_network.sh Loading commit data...
showcache.php Loading commit data...
showplugins.php Loading commit data...
showtable.php Loading commit data...
sitemap.php Loading commit data...
startdaemons.sh Loading commit data...
statusnet.spec Loading commit data...
stopdaemons.sh Loading commit data...
strip_geo.php Loading commit data...
uncache_users.php Loading commit data...
update_po_templates.php Loading commit data...
update_translations.php Loading commit data...
updateavatarurl.php Loading commit data...
updateavatarurl_group.php Loading commit data...
updatelocation.php Loading commit data...
updateprofileurl.php Loading commit data...
useremail.php Loading commit data...
userrole.php Loading commit data...