Zach Copley b7d0746694 Merge branch '0.9.x' into 1.0.x ... 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		2011-02-28 15:39:43 -08:00
..
groupsalmon.php	New event for Salmon including target	2010-12-27 10:51:59 -08:00
ostatusgroup.php	Normalize execution guards on OStatus php files; mostly helps cut down on annoying 'class not found' errors when something spiders the dirs. :P	2010-10-08 10:42:59 -07:00
ostatusinit.php	Fix ticket #3016: when using non-AJAX form of the ostatus subscription initiation for non-local group joins, show the "group" field instead of a blank "user" field	2011-01-26 14:57:52 -08:00
ostatussub.php	remove extraneous <dl> and <dt> tags	2011-01-14 15:36:06 -05:00
ownerxrd.php	Normalize execution guards on OStatus php files; mostly helps cut down on annoying 'class not found' errors when something spiders the dirs. :P	2010-10-08 10:42:59 -07:00
pushcallback.php	Normalize execution guards on OStatus php files; mostly helps cut down on annoying 'class not found' errors when something spiders the dirs. :P	2010-10-08 10:42:59 -07:00
pushhub.php	Normalize execution guards on OStatus php files; mostly helps cut down on annoying 'class not found' errors when something spiders the dirs. :P	2010-10-08 10:42:59 -07:00
usersalmon.php	New event for Salmon including target	2010-12-27 10:51:59 -08:00