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
..
FeedSub.php	*cough* don't commit the code that breaks your code that you used to test the debug code :D	2010-12-20 13:06:58 -08:00
HubSub.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
Magicsig.php	Added doc comments on Salmon magicsig-related stuff to help in figuring out what's going on	2011-01-05 14:05:59 -08:00
Ostatus_profile.php	Merge branch '0.9.x' into 1.0.x	2011-02-28 15:39:43 -08:00
Ostatus_source.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